From 7d63227ce5883bc1f0dde9df7faaa0f2fb495661 Mon Sep 17 00:00:00 2001
From: Artem Los <arteml@kth.se>
Date: Fri, 1 Feb 2019 14:00:27 +0100
Subject: [PATCH] Add more docs and refactor

---
 .idea/misc.xml                                |   1 +
 .idea/workspace.xml                           | 331 +++++++++++-------
 .../java/io/cryptolens/ResponseParser.java    |  26 --
 .../{models => internal}/ActivateResult.java  |   2 +-
 .../{models => internal}/BasicResult.java     |   2 +-
 .../io/cryptolens/internal/HelperMethods.java |   7 +-
 .../{ => legacy}/Base64Response.java          |   4 +-
 .../cryptolens/{ => legacy}/Cryptolens.java   |  21 +-
 .../{ => legacy}/GsonResponseParser.java      |  18 +-
 .../HttpsURLConnectionRequestHandler.java     |  18 +-
 .../JavaSecuritySignatureVerifier.java        |   4 +-
 .../cryptolens/{ => legacy}/LicenseKey.java   |  24 +-
 .../{ => legacy}/MachineCodeComputer.java     |   4 +-
 .../{ => legacy}/RequestHandler.java          |   4 +-
 .../io/cryptolens/legacy/ResponseParser.java  |   6 +
 .../java/io/cryptolens/methods/Helpers.java   |   3 +
 src/main/java/io/cryptolens/methods/Key.java  |  12 +-
 .../io/cryptolens/models/ActivateModel.java   |  59 ++--
 .../java/io/cryptolens/models/LicenseKey.java |   6 +-
 src/test/java/io/cryptolens/KeyTest.java      |   2 -
 20 files changed, 269 insertions(+), 285 deletions(-)
 delete mode 100644 src/main/java/io/cryptolens/ResponseParser.java
 rename src/main/java/io/cryptolens/{models => internal}/ActivateResult.java (77%)
 rename src/main/java/io/cryptolens/{models => internal}/BasicResult.java (77%)
 rename src/main/java/io/cryptolens/{ => legacy}/Base64Response.java (94%)
 rename src/main/java/io/cryptolens/{ => legacy}/Cryptolens.java (92%)
 rename src/main/java/io/cryptolens/{ => legacy}/GsonResponseParser.java (89%)
 rename src/main/java/io/cryptolens/{ => legacy}/HttpsURLConnectionRequestHandler.java (79%)
 rename src/main/java/io/cryptolens/{ => legacy}/JavaSecuritySignatureVerifier.java (96%)
 rename src/main/java/io/cryptolens/{ => legacy}/LicenseKey.java (90%)
 rename src/main/java/io/cryptolens/{ => legacy}/MachineCodeComputer.java (92%)
 rename src/main/java/io/cryptolens/{ => legacy}/RequestHandler.java (92%)
 create mode 100644 src/main/java/io/cryptolens/legacy/ResponseParser.java

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 844be5f..0d260bf 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,6 +3,7 @@
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="JavadocGenerationManager">
     <option name="OUTPUT_DIRECTORY" value="$PROJECT_DIR$/../../test" />
+    <option name="OPTION_SCOPE" value="public" />
   </component>
   <component name="MavenProjectsManager">
     <option name="originalFiles">
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b4bbc53..dccd6dc 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,12 +2,30 @@
 <project version="4">
   <component name="AnalysisUIOptions">
     <option name="ANALYZE_TEST_SOURCES" value="false" />
-    <option name="SCOPE_TYPE" value="3" />
+    <option name="SCOPE_TYPE" value="8" />
+    <option name="CUSTOM_SCOPE_NAME" value="Module 'cryptolens'" />
   </component>
   <component name="ChangeListManager">
     <list default="true" id="43b2cfd6-9146-4b1c-a0ca-55301d2b7477" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/example-app/src/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/example-app/src/Main.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/io/cryptolens/Base64Response.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/io/cryptolens/legacy/Base64Response.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/io/cryptolens/Cryptolens.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/io/cryptolens/legacy/Cryptolens.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/io/cryptolens/GsonResponseParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/io/cryptolens/legacy/GsonResponseParser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/io/cryptolens/HttpsURLConnectionRequestHandler.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/io/cryptolens/legacy/HttpsURLConnectionRequestHandler.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/io/cryptolens/JavaSecuritySignatureVerifier.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/io/cryptolens/legacy/JavaSecuritySignatureVerifier.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/io/cryptolens/LicenseKey.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/io/cryptolens/legacy/LicenseKey.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/io/cryptolens/MachineCodeComputer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/io/cryptolens/legacy/MachineCodeComputer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/io/cryptolens/RequestHandler.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/io/cryptolens/legacy/RequestHandler.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/io/cryptolens/ResponseParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/io/cryptolens/legacy/ResponseParser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/io/cryptolens/internal/HelperMethods.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/io/cryptolens/internal/HelperMethods.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/io/cryptolens/methods/Helpers.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/io/cryptolens/methods/Helpers.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/io/cryptolens/methods/Key.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/io/cryptolens/methods/Key.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/io/cryptolens/models/ActivateModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/io/cryptolens/models/ActivateModel.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/io/cryptolens/models/ActivateResult.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/io/cryptolens/internal/ActivateResult.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/io/cryptolens/models/BasicResult.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/io/cryptolens/internal/BasicResult.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/io/cryptolens/models/LicenseKey.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/io/cryptolens/models/LicenseKey.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/test/java/io/cryptolens/KeyTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/io/cryptolens/KeyTest.java" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -35,13 +53,13 @@
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="1" />
-          <entry key="JAVA" value="46" />
+          <entry key="JAVA" value="73" />
           <entry key="XML" value="5" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="8187" />
+          <entry key="JAVA" value="8602" />
           <entry key="XML" value="86" />
         </counts>
       </usages-collector>
@@ -50,66 +68,58 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/test/java/io/cryptolens/KeyTest.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/io/cryptolens/models/ActivatedMachine.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="654">
-              <caret line="61" lean-forward="true" selection-start-line="61" selection-end-line="61" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state relative-caret-position="17">
+              <caret line="1" lean-forward="true" selection-start-line="1" selection-end-line="1" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/io/cryptolens/methods/Helpers.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/io/cryptolens/methods/Key.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="153">
-              <caret line="77" selection-start-line="77" selection-end-line="81" selection-end-column="7" />
+            <state relative-caret-position="42">
+              <caret line="12" column="55" selection-start-line="12" selection-start-column="55" selection-end-line="12" selection-end-column="55" />
               <folding>
                 <element signature="imports" expanded="true" />
-                <element signature="e#912#913#0" expanded="true" />
-                <element signature="e#967#968#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/io/cryptolens/methods/Key.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/io/cryptolens/legacy/GsonResponseParser.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="221">
-              <caret line="25" column="79" selection-start-line="25" selection-start-column="79" selection-end-line="25" selection-end-column="79" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state relative-caret-position="51">
+              <caret line="7" column="11" selection-start-line="7" selection-start-column="11" selection-end-line="7" selection-end-column="11" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/io/cryptolens/models/ActivatedMachine.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/io/cryptolens/models/ActivateModel.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="85">
-              <caret line="5" column="24" selection-start-line="5" selection-start-column="24" selection-end-line="5" selection-end-column="24" />
+            <state relative-caret-position="51">
+              <caret line="3" column="69" selection-start-line="3" selection-start-column="69" selection-end-line="3" selection-end-column="69" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/io/cryptolens/models/ActivateModel.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/io/cryptolens/internal/ActivateResult.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1139">
-              <caret line="67" column="36" selection-start-line="67" selection-start-column="36" selection-end-line="67" selection-end-column="36" />
+            <state relative-caret-position="34">
+              <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/io/cryptolens/models/ActivateResult.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/io/cryptolens/internal/BasicResult.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="85">
-              <caret line="5" column="28" selection-start-line="5" selection-start-column="28" selection-end-line="5" selection-end-column="28" />
+            <state relative-caret-position="119">
+              <caret line="7" lean-forward="true" selection-start-line="7" selection-end-line="7" />
             </state>
           </provider>
         </entry>
@@ -117,44 +127,46 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/io/cryptolens/models/LicenseKey.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="362">
-              <caret line="114" selection-start-line="114" selection-end-line="114" />
+            <state relative-caret-position="192">
+              <caret line="12" column="49" selection-start-line="12" selection-start-column="49" selection-end-line="12" selection-end-column="49" />
               <folding>
                 <element signature="imports" expanded="true" />
-                <element signature="e#4319#4320#0" expanded="true" />
-                <element signature="e#4363#4364#0" expanded="true" />
-                <element signature="e#4412#4413#0" expanded="true" />
-                <element signature="e#4448#4449#0" expanded="true" />
-                <element signature="e#4497#4498#0" expanded="true" />
-                <element signature="e#4539#4540#0" expanded="true" />
+                <element signature="e#1311#1312#0" expanded="true" />
+                <element signature="e#1345#1346#0" expanded="true" />
+                <element signature="e#4512#4513#0" expanded="true" />
+                <element signature="e#4559#4560#0" expanded="true" />
+                <element signature="e#4729#4730#0" expanded="true" />
+                <element signature="e#4779#4780#0" expanded="true" />
+                <element signature="e#5050#5051#0" expanded="true" />
+                <element signature="e#5106#5107#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pom.xml">
+        <entry file="file://$PROJECT_DIR$/src/main/java/io/cryptolens/legacy/MachineCodeComputer.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="561">
-              <caret line="33" selection-start-line="33" selection-end-line="33" />
+            <state relative-caret-position="51">
+              <caret line="21" column="11" selection-start-line="21" selection-start-column="11" selection-end-line="21" selection-end-column="11" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/io/cryptolens/models/DataObject.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/io/cryptolens/legacy/RequestHandler.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="68">
-              <caret line="4" column="23" selection-start-line="4" selection-start-column="23" selection-end-line="4" selection-end-column="23" />
+            <state relative-caret-position="51">
+              <caret line="21" column="11" selection-start-line="21" selection-start-column="11" selection-end-line="21" selection-end-column="11" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/io/cryptolens/models/Customer.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/io/cryptolens/legacy/ResponseParser.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="119">
-              <caret line="7" column="24" selection-start-line="7" selection-start-column="24" selection-end-line="7" selection-end-column="24" />
+            <state relative-caret-position="17">
+              <caret line="1" column="11" selection-start-line="1" selection-start-column="11" selection-end-line="1" selection-end-column="11" />
             </state>
           </provider>
         </entry>
@@ -186,18 +198,28 @@
         <option value="$PROJECT_DIR$/src/main/java/io/cryptolens/Cryptolens.java" />
         <option value="$PROJECT_DIR$/src/main/java/io/cryptolens/Key.java" />
         <option value="$PROJECT_DIR$/src/main/java/io/cryptolens/Helpers.java" />
-        <option value="$PROJECT_DIR$/src/main/java/io/cryptolens/models/ActivateResult.java" />
         <option value="$PROJECT_DIR$/src/main/java/io/cryptolens/models/BasicResult.java" />
         <option value="$PROJECT_DIR$/src/main/java/io/cryptolens/internal/HelperMethods.java" />
         <option value="$PROJECT_DIR$/src/test/java/io/cryptolens/AppTest.java" />
-        <option value="$PROJECT_DIR$/src/main/java/io/cryptolens/methods/Key.java" />
         <option value="$PROJECT_DIR$/src/main/java/io/cryptolens/models/Customer.java" />
         <option value="$PROJECT_DIR$/src/main/java/io/cryptolens/models/DataObject.java" />
         <option value="$PROJECT_DIR$/src/test/java/io/cryptolens/KeyTest.java" />
         <option value="$PROJECT_DIR$/src/main/java/io/cryptolens/models/ActivatedMachine.java" />
         <option value="$PROJECT_DIR$/pom.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/io/cryptolens/models/ActivateModel.java" />
         <option value="$PROJECT_DIR$/src/main/java/io/cryptolens/methods/Helpers.java" />
+        <option value="$PROJECT_DIR$/src/main/java/io/cryptolens/methods/Key.java" />
+        <option value="$PROJECT_DIR$/src/main/java/io/cryptolens/legacy/Cryptolens.java" />
+        <option value="$PROJECT_DIR$/src/main/java/io/cryptolens/legacy/Base64Response.java" />
+        <option value="$PROJECT_DIR$/src/main/java/io/cryptolens/legacy/GsonResponseParser.java" />
+        <option value="$PROJECT_DIR$/src/main/java/io/cryptolens/legacy/HttpsURLConnectionRequestHandler.java" />
+        <option value="$PROJECT_DIR$/src/main/java/io/cryptolens/legacy/JavaSecuritySignatureVerifier.java" />
+        <option value="$PROJECT_DIR$/src/main/java/io/cryptolens/legacy/LicenseKey.java" />
+        <option value="$PROJECT_DIR$/src/main/java/io/cryptolens/legacy/MachineCodeComputer.java" />
+        <option value="$PROJECT_DIR$/src/main/java/io/cryptolens/legacy/RequestHandler.java" />
+        <option value="$PROJECT_DIR$/src/main/java/io/cryptolens/legacy/ResponseParser.java" />
+        <option value="$PROJECT_DIR$/src/main/java/io/cryptolens/models/ActivateModel.java" />
+        <option value="$PROJECT_DIR$/src/main/java/io/cryptolens/models/ActivateResult.java" />
+        <option value="$PROJECT_DIR$/src/main/java/io/cryptolens/internal/ActivateResult.java" />
         <option value="$PROJECT_DIR$/src/main/java/io/cryptolens/models/LicenseKey.java" />
       </list>
     </option>
@@ -269,6 +291,15 @@
               <item name="cryptolens" type="462c0819:PsiDirectoryNode" />
               <item name="internal" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="cryptolens" type="b2602c69:ProjectViewProjectNode" />
+              <item name="cryptolens-java" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="cryptolens" type="462c0819:PsiDirectoryNode" />
+              <item name="legacy" type="462c0819:PsiDirectoryNode" />
+            </path>
             <path>
               <item name="cryptolens" type="b2602c69:ProjectViewProjectNode" />
               <item name="cryptolens-java" type="462c0819:PsiDirectoryNode" />
@@ -329,7 +360,7 @@
     <property name="project.structure.last.edited" value="Artifacts" />
     <property name="project.structure.proportion" value="0.15" />
     <property name="project.structure.side.proportion" value="0.2" />
-    <property name="settings.editor.selected.configurable" value="editor.preferences.smartKeys" />
+    <property name="settings.editor.selected.configurable" value="preferences.sourceCode.Java" />
   </component>
   <component name="RecentsManager">
     <key name="CopyClassDialog.RECENTS_KEY">
@@ -348,7 +379,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="JUnit.KeyTest.testApp">
+  <component name="RunManager" selected="JUnit.KeyTest">
     <configuration name="App" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="io.cryptolens.App" />
       <module name="cryptolens" />
@@ -380,7 +411,7 @@
       <module name="cryptolens" />
       <extension name="coverage">
         <pattern>
-          <option name="PATTERN" value="io.cryptolens.*" />
+          <option name="PATTERN" value="io.cryptolens.legacy.*" />
           <option name="ENABLED" value="true" />
         </pattern>
       </extension>
@@ -394,7 +425,7 @@
       <module name="cryptolens" />
       <extension name="coverage">
         <pattern>
-          <option name="PATTERN" value="io.cryptolens.*" />
+          <option name="PATTERN" value="io.cryptolens.legacy.*" />
           <option name="ENABLED" value="true" />
         </pattern>
       </extension>
@@ -414,8 +445,8 @@
     </list>
     <recent_temporary>
       <list>
-        <item itemvalue="JUnit.KeyTest.testApp" />
         <item itemvalue="JUnit.KeyTest" />
+        <item itemvalue="JUnit.KeyTest.testApp" />
         <item itemvalue="JUnit.AppTest" />
         <item itemvalue="Application.App" />
       </list>
@@ -432,9 +463,6 @@
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="AppTest - 2019.01.30 at 21h 02m 29s.xml">
-      <configuration name="AppTest" configurationId="JUnit" />
-    </history-entry>
     <history-entry file="KeyTest - 2019.01.30 at 21h 02m 41s.xml">
       <configuration name="KeyTest" configurationId="JUnit" />
     </history-entry>
@@ -462,6 +490,9 @@
     <history-entry file="KeyTest_testApp - 2019.01.31 at 10h 20m 48s.xml">
       <configuration name="KeyTest.testApp" configurationId="JUnit" />
     </history-entry>
+    <history-entry file="KeyTest - 2019.02.01 at 13h 51m 03s.xml">
+      <configuration name="KeyTest" configurationId="JUnit" />
+    </history-entry>
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -482,7 +513,7 @@
       <window_info id="Favorites" order="3" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.32936078" />
-      <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.32827735" />
+      <window_info anchor="bottom" id="Run" order="2" weight="0.32827735" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
@@ -490,7 +521,7 @@
       <window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
       <window_info anchor="bottom" id="Terminal" order="8" />
       <window_info anchor="bottom" id="Event Log" order="9" side_tool="true" />
-      <window_info anchor="bottom" id="Messages" order="10" weight="0.32936078" />
+      <window_info anchor="bottom" id="Messages" order="10" visible="true" weight="0.32936078" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -528,156 +559,179 @@
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/io/cryptolens/App.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/cryptolens/RequestHandler.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/cryptolens/Helpers.java" />
+    <entry file="file://$PROJECT_DIR$/src/test/java/io/cryptolens/AppTest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="85">
-          <caret line="23" column="15" selection-start-line="23" selection-start-column="9" selection-end-line="23" selection-end-column="15" />
+        <state relative-caret-position="442">
+          <caret line="32" column="7" lean-forward="true" selection-start-line="32" selection-start-column="7" selection-end-line="32" selection-end-column="7" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/cryptolens/HttpsURLConnectionRequestHandler.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/cryptolens/internal/HelperMethods.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="92">
-          <caret line="25" column="22" selection-start-line="25" selection-start-column="4" selection-end-line="25" selection-end-column="22" />
+        <state relative-caret-position="578">
+          <caret line="43" column="39" selection-start-line="43" selection-start-column="39" selection-end-line="43" selection-end-column="39" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/cryptolens/LicenseKey.java">
+    <entry file="file://$PROJECT_DIR$/pom.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="391">
-          <caret line="160" column="24" lean-forward="true" selection-start-line="137" selection-end-line="160" selection-end-column="24" />
+        <state relative-caret-position="561">
+          <caret line="33" selection-start-line="33" selection-end-line="33" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/cryptolens/Base64Response.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/cryptolens/models/DataObject.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="68">
-          <caret line="22" column="13" selection-start-line="22" selection-start-column="13" selection-end-line="22" selection-end-column="13" />
+          <caret line="4" column="23" selection-start-line="4" selection-start-column="23" selection-end-line="4" selection-end-column="23" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/cryptolens/GsonResponseParser.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/cryptolens/models/Customer.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1039">
-          <caret line="106" column="62" lean-forward="true" selection-start-line="106" selection-start-column="4" selection-end-line="106" selection-end-column="62" />
+        <state relative-caret-position="119">
+          <caret line="7" column="24" selection-start-line="7" selection-start-column="24" selection-end-line="7" selection-end-column="24" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/cryptolens/Helpers.java" />
-    <entry file="file://$PROJECT_DIR$/src/test/java/io/cryptolens/AppTest.java">
+    <entry file="file://$PROJECT_DIR$/src/test/java/io/cryptolens/KeyTest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="442">
-          <caret line="32" column="7" lean-forward="true" selection-start-line="32" selection-start-column="7" selection-end-line="32" selection-end-column="7" />
+        <state relative-caret-position="354">
+          <caret line="61" lean-forward="true" selection-start-line="61" selection-end-line="61" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/cryptolens/Cryptolens.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/cryptolens/methods/Helpers.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="17">
-          <caret line="71" column="40" selection-start-line="71" selection-start-column="40" selection-end-line="71" selection-end-column="40" />
+        <state relative-caret-position="238">
+          <caret line="14" column="64" selection-start-line="14" selection-start-column="64" selection-end-line="14" selection-end-column="64" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#924#925#0" expanded="true" />
+            <element signature="e#979#980#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/cryptolens/internal/HelperMethods.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/cryptolens/legacy/Cryptolens.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="578">
-          <caret line="43" column="39" selection-start-line="43" selection-start-column="39" selection-end-line="43" selection-end-column="39" />
+        <state relative-caret-position="119">
+          <caret line="7" selection-start-line="7" selection-end-line="7" selection-end-column="11" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/cryptolens/models/BasicResult.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/cryptolens/legacy/Base64Response.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="85">
-          <caret line="5" column="30" selection-start-line="5" selection-start-column="30" selection-end-line="5" selection-end-column="30" />
+        <state relative-caret-position="51">
+          <caret line="21" column="11" selection-start-line="21" selection-start-column="11" selection-end-line="21" selection-end-column="11" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/cryptolens/methods/Key.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/cryptolens/legacy/HttpsURLConnectionRequestHandler.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="221">
-          <caret line="25" column="79" selection-start-line="25" selection-start-column="79" selection-end-line="25" selection-end-column="79" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="51">
+          <caret line="7" column="11" selection-start-line="7" selection-start-column="11" selection-end-line="7" selection-end-column="11" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/cryptolens/models/ActivateModel.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/cryptolens/legacy/JavaSecuritySignatureVerifier.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1139">
-          <caret line="67" column="36" selection-start-line="67" selection-start-column="36" selection-end-line="67" selection-end-column="36" />
+        <state relative-caret-position="51">
+          <caret line="21" column="11" selection-start-line="21" selection-start-column="11" selection-end-line="21" selection-end-column="11" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/cryptolens/legacy/LicenseKey.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="561">
-          <caret line="33" selection-start-line="33" selection-end-line="33" />
+        <state relative-caret-position="17">
+          <caret line="1" column="11" selection-start-line="1" selection-start-column="11" selection-end-line="1" selection-end-column="11" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/cryptolens/models/DataObject.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/cryptolens/legacy/MachineCodeComputer.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="68">
-          <caret line="4" column="23" selection-start-line="4" selection-start-column="23" selection-end-line="4" selection-end-column="23" />
+        <state relative-caret-position="51">
+          <caret line="21" column="11" selection-start-line="21" selection-start-column="11" selection-end-line="21" selection-end-column="11" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/cryptolens/models/Customer.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/cryptolens/legacy/RequestHandler.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="119">
-          <caret line="7" column="24" selection-start-line="7" selection-start-column="24" selection-end-line="7" selection-end-column="24" />
+        <state relative-caret-position="51">
+          <caret line="21" column="11" selection-start-line="21" selection-start-column="11" selection-end-line="21" selection-end-column="11" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/cryptolens/models/ActivatedMachine.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/cryptolens/legacy/ResponseParser.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="85">
-          <caret line="5" column="24" selection-start-line="5" selection-start-column="24" selection-end-line="5" selection-end-column="24" />
+        <state relative-caret-position="17">
+          <caret line="1" column="11" selection-start-line="1" selection-start-column="11" selection-end-line="1" selection-end-column="11" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/cryptolens/models/ActivateResult.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/cryptolens/methods/Key.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="85">
-          <caret line="5" column="28" selection-start-line="5" selection-start-column="28" selection-end-line="5" selection-end-column="28" />
+        <state relative-caret-position="42">
+          <caret line="12" column="55" selection-start-line="12" selection-start-column="55" selection-end-line="12" selection-end-column="55" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/java/io/cryptolens/KeyTest.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/cryptolens/legacy/GsonResponseParser.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="654">
-          <caret line="61" lean-forward="true" selection-start-line="61" selection-end-line="61" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="51">
+          <caret line="7" column="11" selection-start-line="7" selection-start-column="11" selection-end-line="7" selection-end-column="11" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/cryptolens/methods/Helpers.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/cryptolens/models/ActivateModel.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="153">
-          <caret line="77" selection-start-line="77" selection-end-line="81" selection-end-column="7" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#912#913#0" expanded="true" />
-            <element signature="e#967#968#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="51">
+          <caret line="3" column="69" selection-start-line="3" selection-start-column="69" selection-end-line="3" selection-end-column="69" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/cryptolens/models/ActivatedMachine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="17">
+          <caret line="1" lean-forward="true" selection-start-line="1" selection-end-line="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/cryptolens/internal/ActivateResult.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="34">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/cryptolens/internal/BasicResult.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="119">
+          <caret line="7" lean-forward="true" selection-start-line="7" selection-end-line="7" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/io/cryptolens/models/LicenseKey.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="362">
-          <caret line="114" selection-start-line="114" selection-end-line="114" />
+        <state relative-caret-position="192">
+          <caret line="12" column="49" selection-start-line="12" selection-start-column="49" selection-end-line="12" selection-end-column="49" />
           <folding>
             <element signature="imports" expanded="true" />
-            <element signature="e#4319#4320#0" expanded="true" />
-            <element signature="e#4363#4364#0" expanded="true" />
-            <element signature="e#4412#4413#0" expanded="true" />
-            <element signature="e#4448#4449#0" expanded="true" />
-            <element signature="e#4497#4498#0" expanded="true" />
-            <element signature="e#4539#4540#0" expanded="true" />
+            <element signature="e#1311#1312#0" expanded="true" />
+            <element signature="e#1345#1346#0" expanded="true" />
+            <element signature="e#4512#4513#0" expanded="true" />
+            <element signature="e#4559#4560#0" expanded="true" />
+            <element signature="e#4729#4730#0" expanded="true" />
+            <element signature="e#4779#4780#0" expanded="true" />
+            <element signature="e#5050#5051#0" expanded="true" />
+            <element signature="e#5106#5107#0" expanded="true" />
           </folding>
         </state>
       </provider>
@@ -758,6 +812,17 @@
           </splitter-proportions>
         </settings>
       </state>
+      <state key="ScopeChooserConfigurable.UI">
+        <settings>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
     </states>
   </component>
 </project>
\ No newline at end of file
diff --git a/src/main/java/io/cryptolens/ResponseParser.java b/src/main/java/io/cryptolens/ResponseParser.java
deleted file mode 100644
index a7e4104..0000000
--- a/src/main/java/io/cryptolens/ResponseParser.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package io.cryptolens;
-
-import java.io.*;
-import java.nio.*;
-import java.nio.charset.*;
-import java.net.*;
-import java.util.*;
-
-import javax.net.ssl.*;
-
-import com.google.gson.*;
-
-import java.math.BigInteger;
-import java.security.*;
-import java.security.KeyFactory;
-import java.security.PublicKey;
-import java.security.PrivateKey;
-import java.security.Signature;
-import java.security.spec.RSAPublicKeySpec;
-import java.util.Base64;
-import java.util.*;
-
-public interface ResponseParser {
-  public Base64Response parseBase64Response(String response);
-  public LicenseKey parseLicenseKey(byte[] licenseKey);
-}
diff --git a/src/main/java/io/cryptolens/models/ActivateResult.java b/src/main/java/io/cryptolens/internal/ActivateResult.java
similarity index 77%
rename from src/main/java/io/cryptolens/models/ActivateResult.java
rename to src/main/java/io/cryptolens/internal/ActivateResult.java
index 0bd3992..a0319a1 100644
--- a/src/main/java/io/cryptolens/models/ActivateResult.java
+++ b/src/main/java/io/cryptolens/internal/ActivateResult.java
@@ -1,4 +1,4 @@
-package io.cryptolens.models;
+package io.cryptolens.internal;
 
 public class ActivateResult extends BasicResult {
 
diff --git a/src/main/java/io/cryptolens/models/BasicResult.java b/src/main/java/io/cryptolens/internal/BasicResult.java
similarity index 77%
rename from src/main/java/io/cryptolens/models/BasicResult.java
rename to src/main/java/io/cryptolens/internal/BasicResult.java
index 0b29656..e5cc811 100644
--- a/src/main/java/io/cryptolens/models/BasicResult.java
+++ b/src/main/java/io/cryptolens/internal/BasicResult.java
@@ -1,4 +1,4 @@
-package io.cryptolens.models;
+package io.cryptolens.internal;
 
 public class BasicResult {
     public int result;
diff --git a/src/main/java/io/cryptolens/internal/HelperMethods.java b/src/main/java/io/cryptolens/internal/HelperMethods.java
index 5cab5d2..c3625be 100644
--- a/src/main/java/io/cryptolens/internal/HelperMethods.java
+++ b/src/main/java/io/cryptolens/internal/HelperMethods.java
@@ -1,13 +1,10 @@
 package io.cryptolens.internal;
 
 import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
-import io.cryptolens.*;
-import io.cryptolens.models.ActivateResult;
-import io.cryptolens.models.BasicResult;
+import io.cryptolens.legacy.HttpsURLConnectionRequestHandler;
+import io.cryptolens.legacy.RequestHandler;
 
 import java.lang.reflect.Field;
-import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.Map;
 
diff --git a/src/main/java/io/cryptolens/Base64Response.java b/src/main/java/io/cryptolens/legacy/Base64Response.java
similarity index 94%
rename from src/main/java/io/cryptolens/Base64Response.java
rename to src/main/java/io/cryptolens/legacy/Base64Response.java
index 828f2c0..2afc702 100644
--- a/src/main/java/io/cryptolens/Base64Response.java
+++ b/src/main/java/io/cryptolens/legacy/Base64Response.java
@@ -1,4 +1,4 @@
-package io.cryptolens;
+package io.cryptolens.legacy;
 
 import java.io.*;
 import java.nio.*;
@@ -19,7 +19,7 @@
 import java.security.spec.RSAPublicKeySpec;
 import java.util.Base64;
 import java.util.*;
-
+@Deprecated
 public class Base64Response {
   public byte[] licenseKey;
   public byte[] signature;
diff --git a/src/main/java/io/cryptolens/Cryptolens.java b/src/main/java/io/cryptolens/legacy/Cryptolens.java
similarity index 92%
rename from src/main/java/io/cryptolens/Cryptolens.java
rename to src/main/java/io/cryptolens/legacy/Cryptolens.java
index 4315f70..b79e9ae 100644
--- a/src/main/java/io/cryptolens/Cryptolens.java
+++ b/src/main/java/io/cryptolens/legacy/Cryptolens.java
@@ -1,28 +1,11 @@
-package io.cryptolens;
+package io.cryptolens.legacy;
 
-import java.io.*;
-import java.nio.*;
-import java.nio.charset.*;
-import java.net.*;
-import java.util.*;
-
-import javax.net.ssl.*;
-
-import com.google.gson.*;
-
-import java.math.BigInteger;
-import java.security.*;
-import java.security.KeyFactory;
-import java.security.PublicKey;
-import java.security.PrivateKey;
-import java.security.Signature;
-import java.security.spec.RSAPublicKeySpec;
-import java.util.Base64;
 import java.util.*;
 
 /**
  * The main class that contains methods to verify license keys.
  */
+@Deprecated
 public class Cryptolens {
     private JavaSecuritySignatureVerifier signatureVerifier;
     private RequestHandler requestHandler;
diff --git a/src/main/java/io/cryptolens/GsonResponseParser.java b/src/main/java/io/cryptolens/legacy/GsonResponseParser.java
similarity index 89%
rename from src/main/java/io/cryptolens/GsonResponseParser.java
rename to src/main/java/io/cryptolens/legacy/GsonResponseParser.java
index 02205b1..a262ff2 100644
--- a/src/main/java/io/cryptolens/GsonResponseParser.java
+++ b/src/main/java/io/cryptolens/legacy/GsonResponseParser.java
@@ -1,25 +1,11 @@
-package io.cryptolens;
+package io.cryptolens.legacy;
 
-import java.io.*;
-import java.nio.*;
 import java.nio.charset.*;
-import java.net.*;
-import java.util.*;
-
-import javax.net.ssl.*;
 
 import com.google.gson.*;
 
-import java.math.BigInteger;
-import java.security.*;
-import java.security.KeyFactory;
-import java.security.PublicKey;
-import java.security.PrivateKey;
-import java.security.Signature;
-import java.security.spec.RSAPublicKeySpec;
 import java.util.Base64;
-import java.util.*;
-
+@Deprecated
 public class GsonResponseParser implements ResponseParser {
   private static class GsonBase64Response {
     public String licenseKey;
diff --git a/src/main/java/io/cryptolens/HttpsURLConnectionRequestHandler.java b/src/main/java/io/cryptolens/legacy/HttpsURLConnectionRequestHandler.java
similarity index 79%
rename from src/main/java/io/cryptolens/HttpsURLConnectionRequestHandler.java
rename to src/main/java/io/cryptolens/legacy/HttpsURLConnectionRequestHandler.java
index 261c7b5..c10509e 100644
--- a/src/main/java/io/cryptolens/HttpsURLConnectionRequestHandler.java
+++ b/src/main/java/io/cryptolens/legacy/HttpsURLConnectionRequestHandler.java
@@ -1,25 +1,11 @@
-package io.cryptolens;
+package io.cryptolens.legacy;
 
 import java.io.*;
-import java.nio.*;
-import java.nio.charset.*;
 import java.net.*;
 import java.util.*;
 
 import javax.net.ssl.*;
-
-import com.google.gson.*;
-
-import java.math.BigInteger;
-import java.security.*;
-import java.security.KeyFactory;
-import java.security.PublicKey;
-import java.security.PrivateKey;
-import java.security.Signature;
-import java.security.spec.RSAPublicKeySpec;
-import java.util.Base64;
-import java.util.*;
-
+@Deprecated
 public class HttpsURLConnectionRequestHandler implements RequestHandler {
   public String makePostRequest(String url, Map<String,String> params) throws Exception {
     URL url_ = new URL(url);
diff --git a/src/main/java/io/cryptolens/JavaSecuritySignatureVerifier.java b/src/main/java/io/cryptolens/legacy/JavaSecuritySignatureVerifier.java
similarity index 96%
rename from src/main/java/io/cryptolens/JavaSecuritySignatureVerifier.java
rename to src/main/java/io/cryptolens/legacy/JavaSecuritySignatureVerifier.java
index c0c870f..9ee29c1 100644
--- a/src/main/java/io/cryptolens/JavaSecuritySignatureVerifier.java
+++ b/src/main/java/io/cryptolens/legacy/JavaSecuritySignatureVerifier.java
@@ -1,4 +1,4 @@
-package io.cryptolens;
+package io.cryptolens.legacy;
 
 import java.io.*;
 import java.nio.*;
@@ -19,7 +19,7 @@
 import java.security.spec.RSAPublicKeySpec;
 import java.util.Base64;
 import java.util.*;
-
+@Deprecated
 public class JavaSecuritySignatureVerifier {
   private BigInteger mod;
   private BigInteger exp;
diff --git a/src/main/java/io/cryptolens/LicenseKey.java b/src/main/java/io/cryptolens/legacy/LicenseKey.java
similarity index 90%
rename from src/main/java/io/cryptolens/LicenseKey.java
rename to src/main/java/io/cryptolens/legacy/LicenseKey.java
index 4da52be..97257c6 100644
--- a/src/main/java/io/cryptolens/LicenseKey.java
+++ b/src/main/java/io/cryptolens/legacy/LicenseKey.java
@@ -1,25 +1,5 @@
-package io.cryptolens;
-
-import java.io.*;
-import java.nio.*;
-import java.nio.charset.*;
-import java.net.*;
-import java.util.*;
-
-import javax.net.ssl.*;
-
-import com.google.gson.*;
-
-import java.math.BigInteger;
-import java.security.*;
-import java.security.KeyFactory;
-import java.security.PublicKey;
-import java.security.PrivateKey;
-import java.security.Signature;
-import java.security.spec.RSAPublicKeySpec;
-import java.util.Base64;
-import java.util.*;
-
+package io.cryptolens.legacy;
+@Deprecated
 public class LicenseKey {
   public static class Builder {
     private final LicenseKey licenseKey;
diff --git a/src/main/java/io/cryptolens/MachineCodeComputer.java b/src/main/java/io/cryptolens/legacy/MachineCodeComputer.java
similarity index 92%
rename from src/main/java/io/cryptolens/MachineCodeComputer.java
rename to src/main/java/io/cryptolens/legacy/MachineCodeComputer.java
index 09777be..6225d6d 100644
--- a/src/main/java/io/cryptolens/MachineCodeComputer.java
+++ b/src/main/java/io/cryptolens/legacy/MachineCodeComputer.java
@@ -1,4 +1,4 @@
-package io.cryptolens;
+package io.cryptolens.legacy;
 
 import java.io.*;
 import java.nio.*;
@@ -19,7 +19,7 @@
 import java.security.spec.RSAPublicKeySpec;
 import java.util.Base64;
 import java.util.*;
-
+@Deprecated
 public interface MachineCodeComputer {
   public String computeMachineCode();
 }
diff --git a/src/main/java/io/cryptolens/RequestHandler.java b/src/main/java/io/cryptolens/legacy/RequestHandler.java
similarity index 92%
rename from src/main/java/io/cryptolens/RequestHandler.java
rename to src/main/java/io/cryptolens/legacy/RequestHandler.java
index f923882..fd2a188 100644
--- a/src/main/java/io/cryptolens/RequestHandler.java
+++ b/src/main/java/io/cryptolens/legacy/RequestHandler.java
@@ -1,4 +1,4 @@
-package io.cryptolens;
+package io.cryptolens.legacy;
 
 import java.io.*;
 import java.nio.*;
@@ -19,7 +19,7 @@
 import java.security.spec.RSAPublicKeySpec;
 import java.util.Base64;
 import java.util.*;
-
+@Deprecated
 public interface RequestHandler {
   public String makePostRequest(String url, Map<String,String> params) throws Exception;
 }
diff --git a/src/main/java/io/cryptolens/legacy/ResponseParser.java b/src/main/java/io/cryptolens/legacy/ResponseParser.java
new file mode 100644
index 0000000..0d06f5b
--- /dev/null
+++ b/src/main/java/io/cryptolens/legacy/ResponseParser.java
@@ -0,0 +1,6 @@
+package io.cryptolens.legacy;
+@Deprecated
+public interface ResponseParser {
+  public Base64Response parseBase64Response(String response);
+  public LicenseKey parseLicenseKey(byte[] licenseKey);
+}
diff --git a/src/main/java/io/cryptolens/methods/Helpers.java b/src/main/java/io/cryptolens/methods/Helpers.java
index 1f181c4..d0acc57 100644
--- a/src/main/java/io/cryptolens/methods/Helpers.java
+++ b/src/main/java/io/cryptolens/methods/Helpers.java
@@ -11,6 +11,9 @@
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 
+/**
+ * A collection of helper methods that operate on a license key.
+ */
 public class Helpers {
 
     /**
diff --git a/src/main/java/io/cryptolens/methods/Key.java b/src/main/java/io/cryptolens/methods/Key.java
index 88d0cfd..1ffae75 100644
--- a/src/main/java/io/cryptolens/methods/Key.java
+++ b/src/main/java/io/cryptolens/methods/Key.java
@@ -1,19 +1,17 @@
 package io.cryptolens.methods;
 
-import com.google.gson.Gson;
-import io.cryptolens.*;
 import io.cryptolens.internal.HelperMethods;
 import io.cryptolens.models.ActivateModel;
-import io.cryptolens.models.ActivateResult;
-import io.cryptolens.models.BasicResult;
+import io.cryptolens.internal.ActivateResult;
 import io.cryptolens.models.LicenseKey;
 
-import java.lang.reflect.Field;
-import java.nio.charset.StandardCharsets;
-import java.util.Base64;
 import java.util.HashMap;
 import java.util.Map;
 
+/**
+ * A collection of methods that operate on a license key. Please see a complete
+ * list here: https://app.cryptolens.io/docs/api/v3/Key
+ */
 public class Key {
 
     /**
diff --git a/src/main/java/io/cryptolens/models/ActivateModel.java b/src/main/java/io/cryptolens/models/ActivateModel.java
index 5cbd8bb..c01bac3 100644
--- a/src/main/java/io/cryptolens/models/ActivateModel.java
+++ b/src/main/java/io/cryptolens/models/ActivateModel.java
@@ -1,47 +1,50 @@
 package io.cryptolens.models;
 
+/**
+ * The parameters that are used when calling the Key.Activate method.
+ */
 public class ActivateModel {
 
-    /// <summary>
-    /// The product id, which can be found on the product page.
-    /// </summary>
+    /**
+     * The product id, which can be found on the product page.
+     */
     public int ProductId;
 
-    /// <summary>
-    /// The Key string, eg. AAAA-BBBB-CCCC-DDDD.
-    /// </summary>
+    /**
+     * The Key string, eg. AAAA-BBBB-CCCC-DDDD.
+     */
     public String Key;
 
-    /// <summary>
-    /// The machine code (a string that identifies a device) for activation.
-    /// </summary>
+    /**
+     * The machine code (a string that identifies a device) for activation.
+     */
     public String MachineCode;
 
-    /// <summary>
-    /// An integer that allows you to restrict the information returned in the license key data object.
-    /// Please read https://app.cryptolens.io/docs/api/v3/Activate#remarks for more details.
-    /// </summary>
+    /**
+     * An integer that allows you to restrict the information returned in the license key data object.
+     * Please read https://app.cryptolens.io/docs/api/v3/Activate#remarks for more details.
+     */
     public int FieldsToReturn;
 
-    /// <summary>
-    /// Includes additional information about the license key, such as number of activated devices, etc.
-    /// </summary>
+    /**
+     * Includes additional information about the license key, such as number of activated devices, etc.
+     */
     public boolean Metadata;
 
-    /// <summary>
-    /// When set to something greater than zero, floating licensing will be enabled.
-    /// The time interval is then used to check that no more than the allowed number
-    /// of machine codes (specified in maximumNumberOfMachines) have been activated
-    /// in that time period (in seconds).
-    /// </summary>
+    /**
+     * When set to something greater than zero, floating licensing will be enabled.
+     * The time interval is then used to check that no more than the allowed number
+     * of machine codes (specified in maximumNumberOfMachines) have been activated
+     * in that time period (in seconds).
+     */
     public int FloatingTimeInterval;
 
-    /// <summary>
-    /// When set to something greater than zero (and assuming FloatingTimeInterval is set too)
-    /// floating licensing will permit a license overdraft (eg. activation will succeed even if
-    /// maximumNumberOfMachines is reached). MaxOverdraft value specifies how much we can exceed
-    /// the maximumNumberOfMachines value.
-    /// </summary>
+    /**
+     * When set to something greater than zero (and assuming FloatingTimeInterval is set too)
+     * floating licensing will permit a license overdraft (eg. activation will succeed even if
+     * maximumNumberOfMachines is reached). MaxOverdraft value specifies how much we can exceed
+     * the maximumNumberOfMachines value.
+     */
     public int MaxOverdraft;
 
     public ActivateModel() {
diff --git a/src/main/java/io/cryptolens/models/LicenseKey.java b/src/main/java/io/cryptolens/models/LicenseKey.java
index 4a7c5de..0d49b47 100644
--- a/src/main/java/io/cryptolens/models/LicenseKey.java
+++ b/src/main/java/io/cryptolens/models/LicenseKey.java
@@ -1,13 +1,17 @@
 package io.cryptolens.models;
 
 import com.google.gson.Gson;
-import io.cryptolens.JavaSecuritySignatureVerifier;
+import io.cryptolens.internal.ActivateResult;
+import io.cryptolens.legacy.JavaSecuritySignatureVerifier;
 import io.cryptolens.methods.Helpers;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;
 import java.util.List;
 
+/**
+ * Represents a license returned by Key.Activate.
+ */
 public class LicenseKey {
     public int ProductId;
     public long Id;
diff --git a/src/test/java/io/cryptolens/KeyTest.java b/src/test/java/io/cryptolens/KeyTest.java
index 2511045..97c48ca 100644
--- a/src/test/java/io/cryptolens/KeyTest.java
+++ b/src/test/java/io/cryptolens/KeyTest.java
@@ -3,8 +3,6 @@
 import io.cryptolens.methods.Helpers;
 import io.cryptolens.methods.Key;
 import io.cryptolens.models.ActivateModel;
-import io.cryptolens.models.ActivateResult;
-import io.cryptolens.models.BasicResult;
 import io.cryptolens.models.LicenseKey;
 import junit.framework.Test;
 import junit.framework.TestCase;