diff --git a/CarbonQueryDatabase_Adapter/CarbonQueryDatabase_Adapter.cs b/CarbonQueryDatabase_Adapter/CarbonQueryDatabase_Adapter.cs
index 8621409..da5d2be 100644
--- a/CarbonQueryDatabase_Adapter/CarbonQueryDatabase_Adapter.cs
+++ b/CarbonQueryDatabase_Adapter/CarbonQueryDatabase_Adapter.cs
@@ -41,7 +41,6 @@ public partial class CarbonQueryDatabaseAdapter : BHoMAdapter
         /**** Constructors                              ****/
         /***************************************************/
 
-        [PreviousVersion("6.2", "BH.Adapter.CarbonQueryDatabaseAdapter(System.String, System.String, System.Bool)")]
         [Description("Adapter to connect to CarbonQueryDatabase.")]
         [Input("apiToken", "Provide EC3 API Token")]
         [Output("adapter", "Adapter results")]
diff --git a/CarbonQueryDatabase_Adapter/CarbonQueryDatabase_Adapter.csproj b/CarbonQueryDatabase_Adapter/CarbonQueryDatabase_Adapter.csproj
index 75d4bab..1a3e001 100644
--- a/CarbonQueryDatabase_Adapter/CarbonQueryDatabase_Adapter.csproj
+++ b/CarbonQueryDatabase_Adapter/CarbonQueryDatabase_Adapter.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -33,62 +33,62 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Adapter_oM">
-      <HintPath>C:\ProgramData\BHoM\Assemblies\Adapter_oM.dll</HintPath>
+      <HintPath>$(ProgramData)\BHoM\Assemblies\Adapter_oM.dll</HintPath>
       <Private>False</Private>
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="BHoM">
-      <HintPath>C:\ProgramData\BHoM\Assemblies\BHoM.dll</HintPath>
+      <HintPath>$(ProgramData)\BHoM\Assemblies\BHoM.dll</HintPath>
       <Private>False</Private>
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="BHoM_Adapter">
-      <HintPath>C:\ProgramData\BHoM\Assemblies\BHoM_Adapter.dll</HintPath>
+      <HintPath>$(ProgramData)\BHoM\Assemblies\BHoM_Adapter.dll</HintPath>
       <Private>False</Private>
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="BHoM_Engine">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
-      <HintPath>C:\ProgramData\BHoM\Assemblies\BHoM_Engine.dll</HintPath>
+      <HintPath>$(ProgramData)\BHoM\Assemblies\BHoM_Engine.dll</HintPath>
     </Reference>
     <Reference Include="Data_oM">
-      <HintPath>C:\ProgramData\BHoM\Assemblies\Data_oM.dll</HintPath>
+      <HintPath>$(ProgramData)\BHoM\Assemblies\Data_oM.dll</HintPath>
       <Private>False</Private>
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="HTTP_Engine">
-      <HintPath>C:\ProgramData\BHoM\Assemblies\HTTP_Engine.dll</HintPath>
+      <HintPath>$(ProgramData)\BHoM\Assemblies\HTTP_Engine.dll</HintPath>
       <Private>False</Private>
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="HTTP_oM">
-      <HintPath>C:\ProgramData\BHoM\Assemblies\HTTP_oM.dll</HintPath>
+      <HintPath>$(ProgramData)\BHoM\Assemblies\HTTP_oM.dll</HintPath>
       <Private>False</Private>
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="LifeCycleAssessment_oM">
-      <HintPath>C:\ProgramData\BHoM\Assemblies\LifeCycleAssessment_oM.dll</HintPath>
+      <HintPath>$(ProgramData)\BHoM\Assemblies\LifeCycleAssessment_oM.dll</HintPath>
       <Private>False</Private>
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="Physical_oM">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
-      <HintPath>C:\ProgramData\BHoM\Assemblies\Physical_oM.dll</HintPath>
+      <HintPath>$(ProgramData)\BHoM\Assemblies\Physical_oM.dll</HintPath>
     </Reference>
     <Reference Include="Reflection_Engine">
-      <HintPath>C:\ProgramData\BHoM\Assemblies\Reflection_Engine.dll</HintPath>
+      <HintPath>$(ProgramData)\BHoM\Assemblies\Reflection_Engine.dll</HintPath>
       <Private>False</Private>
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="Serialiser_Engine">
-      <HintPath>C:\ProgramData\BHoM\Assemblies\Serialiser_Engine.dll</HintPath>
+      <HintPath>$(ProgramData)\BHoM\Assemblies\Serialiser_Engine.dll</HintPath>
       <Private>False</Private>
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="Units_Engine">
-      <HintPath>C:\ProgramData\BHoM\Assemblies\Units_Engine.dll</HintPath>
+      <HintPath>$(ProgramData)\BHoM\Assemblies\Units_Engine.dll</HintPath>
       <Private>False</Private>
       <SpecificVersion>False</SpecificVersion>
     </Reference>
@@ -125,4 +125,4 @@
     <PostBuildEvent>xcopy "$(TargetDir)$(TargetFileName)"  "C:\ProgramData\BHoM\Assemblies" /Y
 </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/CarbonQueryDatabase_Adapter/Properties/AssemblyInfo.cs b/CarbonQueryDatabase_Adapter/Properties/AssemblyInfo.cs
index 8e8ecb8..3ebdf67 100644
--- a/CarbonQueryDatabase_Adapter/Properties/AssemblyInfo.cs
+++ b/CarbonQueryDatabase_Adapter/Properties/AssemblyInfo.cs
@@ -55,7 +55,7 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("6.0.0.0")]
-[assembly: AssemblyFileVersion("6.2.0.0")]
+[assembly: AssemblyFileVersion("6.3.0.0")]
 
 
 
diff --git a/CarbonQueryDatabase_Engine/CarbonQueryDatabase_Engine.csproj b/CarbonQueryDatabase_Engine/CarbonQueryDatabase_Engine.csproj
index 27a1033..8eb6868 100644
--- a/CarbonQueryDatabase_Engine/CarbonQueryDatabase_Engine.csproj
+++ b/CarbonQueryDatabase_Engine/CarbonQueryDatabase_Engine.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -76,7 +76,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Create\GetRequest.cs" />
+    <Compile Include="Create\GetRequest\CarbonQueryDatabaseRequest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -103,4 +103,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
\ No newline at end of file
diff --git a/CarbonQueryDatabase_Engine/Create/GetRequest.cs b/CarbonQueryDatabase_Engine/Create/GetRequest/CarbonQueryDatabaseRequest.cs
similarity index 100%
rename from CarbonQueryDatabase_Engine/Create/GetRequest.cs
rename to CarbonQueryDatabase_Engine/Create/GetRequest/CarbonQueryDatabaseRequest.cs
diff --git a/CarbonQueryDatabase_Engine/Properties/AssemblyInfo.cs b/CarbonQueryDatabase_Engine/Properties/AssemblyInfo.cs
index 836902c..a990578 100644
--- a/CarbonQueryDatabase_Engine/Properties/AssemblyInfo.cs
+++ b/CarbonQueryDatabase_Engine/Properties/AssemblyInfo.cs
@@ -55,7 +55,7 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("6.0.0.0")]
-[assembly: AssemblyFileVersion("6.2.0.0")]
+[assembly: AssemblyFileVersion("6.3.0.0")]
 
 
 
diff --git a/CarbonQueryDatabase_Engine/Versioning_62.json b/CarbonQueryDatabase_Engine/Versioning_62.json
deleted file mode 100644
index 090e47f..0000000
--- a/CarbonQueryDatabase_Engine/Versioning_62.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "Namespace": {
-    "ToNew": {
-    },
-    "ToOld": {
-    }
-  },
-  "Type": {
-    "ToNew": {
-
-    },
-    "ToOld": {
-
-    }
-  },
-  "Method": {
-    "ToNew": {
-      
-    },
-    "ToOld": {
-    }
-  },
-  "Property": {
-    "ToNew": {
-
-    },
-    "ToOld": {
-
-    }
-  },
-  "MessageForDeleted": {
-    "BH.Engine.Adapters.CarbonQueryDatabase.Compute.CQDBearerToken(System.String, System.String)" : "This method has been removed following a refactor to utilise API keys rather than usernames and passwords for security purposes. Please obtain an API key from the provider and plug that into the Adapter to use this toolkit.",},
-  "MessageForNoUpgrade": {
-
-  }
-}
\ No newline at end of file
diff --git a/CarbonQueryDatabase_oM/CarbonQueryDatabase_oM.csproj b/CarbonQueryDatabase_oM/CarbonQueryDatabase_oM.csproj
index 1d4c74b..546ce85 100644
--- a/CarbonQueryDatabase_oM/CarbonQueryDatabase_oM.csproj
+++ b/CarbonQueryDatabase_oM/CarbonQueryDatabase_oM.csproj
@@ -32,23 +32,23 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Adapter_oM">
-      <HintPath>C:\ProgramData\BHoM\Assemblies\Adapter_oM.dll</HintPath>
+      <HintPath>$(ProgramData)\BHoM\Assemblies\Adapter_oM.dll</HintPath>
       <Private>False</Private>
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="BHoM">
-      <HintPath>C:\ProgramData\BHoM\Assemblies\BHoM.dll</HintPath>
+      <HintPath>$(ProgramData)\BHoM\Assemblies\BHoM.dll</HintPath>
       <Private>False</Private>
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="Data_oM">
-      <HintPath>C:\ProgramData\BHoM\Assemblies\Data_oM.dll</HintPath>
+      <HintPath>$(ProgramData)\BHoM\Assemblies\Data_oM.dll</HintPath>
       <Private>False</Private>
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="LifeCycleAssessment_oM">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>C:\ProgramData\BHoM\Assemblies\LifeCycleAssessment_oM.dll</HintPath>
+      <HintPath>$(ProgramData)\BHoM\Assemblies\LifeCycleAssessment_oM.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/CarbonQueryDatabase_oM/Properties/AssemblyInfo.cs b/CarbonQueryDatabase_oM/Properties/AssemblyInfo.cs
index d3fedd4..6fdd81a 100644
--- a/CarbonQueryDatabase_oM/Properties/AssemblyInfo.cs
+++ b/CarbonQueryDatabase_oM/Properties/AssemblyInfo.cs
@@ -55,7 +55,7 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("6.0.0.0")]
-[assembly: AssemblyFileVersion("6.2.0.0")]
+[assembly: AssemblyFileVersion("6.3.0.0")]