diff --git a/nim.cfg b/nim.cfg
index efe65e3..664de18 100644
--- a/nim.cfg
+++ b/nim.cfg
@@ -1 +1 @@
--d:NimteropTemplate_SetVer="M.M.V" -d:NimteropTemplate_DL -d:NimteropTemplate_Static
+-d:Project_SetVer="M.M.V" -d:Project_DL -d:Project_Static
diff --git a/nimterop_template.nimble b/project.nimble
similarity index 77%
rename from nimterop_template.nimble
rename to project.nimble
index fd0d4bd..8141d30 100644
--- a/nimterop_template.nimble
+++ b/project.nimble
@@ -10,4 +10,4 @@ srcDir        = "src"
 
 # Dependencies
 
-requires "nim >= 1.0.6", "nimterop#head"
+requires "nim >= 1.0.6", "nimterop#head", "regex"
diff --git a/src/nimterop_template.nim b/src/nimterop_template.nim
deleted file mode 100644
index 7427ab1..0000000
--- a/src/nimterop_template.nim
+++ /dev/null
@@ -1,3 +0,0 @@
-import nimterop_template/nimterop_template
-
-export nimterop_template
diff --git a/src/project.nim b/src/project.nim
new file mode 100644
index 0000000..9e04484
--- /dev/null
+++ b/src/project.nim
@@ -0,0 +1,3 @@
+import project/project
+
+export project
diff --git a/src/nimterop_template/cleansymbols.nim b/src/project/cleansymbols.nim
similarity index 100%
rename from src/nimterop_template/cleansymbols.nim
rename to src/project/cleansymbols.nim
diff --git a/src/nimterop_template/nimterop_template.nim b/src/project/project.nim
similarity index 70%
rename from src/nimterop_template/nimterop_template.nim
rename to src/project/project.nim
index e7b4ede..1a06e4f 100644
--- a/src/nimterop_template/nimterop_template.nim
+++ b/src/project/project.nim
@@ -2,7 +2,7 @@ import os, strutils, strformat
 import nimterop/[cimport, build]
 
 const
-  SDLCacheDir* = currentSourcePath.parentDir().parentDir() / "build" #getProjectCacheDir("nimsdl2")
+  ProjectCacheDir* = currentSourcePath.parentDir().parentDir() / "build" #getProjectCacheDir("nimsdl2")
   baseDir = SDLCacheDir
   srcDir = baseDir / "sdl2"
   buildDir = srcDir / "buildcache"
@@ -33,7 +33,7 @@ cOverride:
 
 cPluginPath(symbolPluginPath)
 
-when defined(NimteropTemplate_Static):
-  cImport(NimteropTemplate_Path, recurse = true, flags = "-f=ast2 -E__,_ -F__,_")
+when defined(Project_Static):
+  cImport(Project_Path, recurse = true, flags = "-f=ast2 -E__,_ -F__,_")
 else:
-  cImport(NimteropTemplate_Path, recurse = true, dynlib = "NimteropTemplate_LPath", flags = "-f=ast2 -E__,_ -F__,_")
+  cImport(Project_Path, recurse = true, dynlib = "Project_LPath", flags = "-f=ast2 -E__,_ -F__,_")