diff --git a/.gitignore b/.gitignore
index 826ef38..7af7a48 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,5 @@ bin/
 obj/
 *.dll
 *.pem
-.vscode/
\ No newline at end of file
+.vscode/
+*.pfx
\ No newline at end of file
diff --git a/cert.cert b/.keys/cert.cert
similarity index 100%
rename from cert.cert
rename to .keys/cert.cert
diff --git a/build.sh b/build.sh
index 0b773f8..eb98d25 100755
--- a/build.sh
+++ b/build.sh
@@ -1,5 +1,13 @@
 #!/bin/bash
 
+mkdir ./src/bitbetter/.keys
+
+cp .keys/cert.cert ./src/bitbetter/.keys
+
+cd ./src/bitbetter
+
 dotnet restore
 dotnet publish
-docker build . -t bitbetter/api # --squash
\ No newline at end of file
+
+docker build . -t bitbetter/api # --squash
+
diff --git a/src/bitBetter/.keys/cert.cert b/src/bitBetter/.keys/cert.cert
new file mode 100644
index 0000000..740465b
Binary files /dev/null and b/src/bitBetter/.keys/cert.cert differ
diff --git a/Dockerfile b/src/bitBetter/Dockerfile
similarity index 83%
rename from Dockerfile
rename to src/bitBetter/Dockerfile
index a48c7f5..9e3dea9 100644
--- a/Dockerfile
+++ b/src/bitBetter/Dockerfile
@@ -1,7 +1,7 @@
 FROM bitwarden/api
 
 COPY bin/Debug/netcoreapp2.0/publish/* /bitBetter/
-COPY cert.cert /newLicensing.cer
+COPY ./.keys/cert.cert /newLicensing.cer
 
 RUN dotnet /bitBetter/bitBetter.dll && \
     echo "modified dll" && \
diff --git a/Program.cs b/src/bitBetter/Program.cs
similarity index 100%
rename from Program.cs
rename to src/bitBetter/Program.cs
diff --git a/bitBetter.csproj b/src/bitBetter/bitBetter.csproj
similarity index 100%
rename from bitBetter.csproj
rename to src/bitBetter/bitBetter.csproj
diff --git a/src/licenseGen/Program.cs b/src/licenseGen/Program.cs
new file mode 100644
index 0000000..1c5747d
--- /dev/null
+++ b/src/licenseGen/Program.cs
@@ -0,0 +1,93 @@
+using System;
+using System.IO;
+using System.Linq;
+using System.Security.Cryptography.X509Certificates;
+using Mono.Cecil;
+using Mono.Cecil.Cil;
+using Mono.Cecil.Rocks;
+
+namespace bitwardenSelfLicensor
+{
+    class Program
+    {
+        static int Main(string[] args)
+        {
+            string cerFile;
+            string corePath;
+
+            if(args.Length >= 2) {
+                cerFile = args[0];
+                corePath = args[1];
+            } else if (args.Length == 1) {
+                cerFile = args[0];
+                corePath = "/app/Core.dll";
+            }
+            else {
+                cerFile = "/newLicensing.cer";
+                corePath = "/app/Core.dll";
+            }
+
+
+            var module =  ModuleDefinition.ReadModule(new MemoryStream(File.ReadAllBytes(corePath)));
+            var cert = File.ReadAllBytes(cerFile);
+
+            var x = module.Resources.OfType<EmbeddedResource>()
+                                    .Where(r => r.Name.Equals("Bit.Core.licensing.cer"))
+                                    .First();
+
+            Console.WriteLine(x.Name);
+
+            var e = new EmbeddedResource("Bit.Core.licensing.cer", x.Attributes, cert);
+
+            module.Resources.Add(e);
+            module.Resources.Remove(x);
+
+            var services = module.Types.Where(t => t.Namespace == "Bit.Core.Services");
+            
+
+            var type = services.First(t => t.Name == "LicensingService");
+
+            var licensingType =  type.Resolve();
+
+            var existingCert = new X509Certificate2(x.GetResourceData());
+
+            Console.WriteLine($"Existing Cert Thumbprin: {existingCert.Thumbprint}");
+            X509Certificate2 certificate = new X509Certificate2(cert);
+
+            Console.WriteLine($"New cert Thumbprint: {certificate.Thumbprint}");
+
+            var ctor = licensingType.GetConstructors().Single();
+
+
+            var rewriter = ctor.Body.GetILProcessor();
+
+            var instToReplace = 
+                ctor.Body.Instructions.Where(i => i.OpCode == OpCodes.Ldstr
+                    && string.Equals((string)i.Operand, existingCert.Thumbprint, StringComparison.InvariantCultureIgnoreCase))
+                .FirstOrDefault();
+
+            if(instToReplace != null) {
+                rewriter.Replace(instToReplace, Instruction.Create(OpCodes.Ldstr, certificate.Thumbprint));
+            }
+            else {
+                Console.WriteLine("Cant find inst");
+            }
+
+            // foreach (var inst in ctor.Body.Instructions)
+            // {
+            //     Console.Write(inst.OpCode.Name + " " + inst.Operand?.GetType() + " = ");
+            //     if(inst.OpCode.FlowControl == FlowControl.Call) {
+            //         Console.WriteLine(inst.Operand);
+            //     }
+            //     else if(inst.OpCode == OpCodes.Ldstr) {
+            //         Console.WriteLine(inst.Operand);
+            //     }
+            //     else {Console.WriteLine();}
+            // }
+
+            module.Write("modified.dll");
+
+            return 0;
+        }
+    }
+}
diff --git a/src/licenseGen/licenseGen.csproj b/src/licenseGen/licenseGen.csproj
new file mode 100644
index 0000000..ce1697a
--- /dev/null
+++ b/src/licenseGen/licenseGen.csproj
@@ -0,0 +1,8 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
+  </PropertyGroup>
+
+</Project>