diff --git a/svvpi/includes/README.org b/includes/README.org
similarity index 100%
rename from svvpi/includes/README.org
rename to includes/README.org
diff --git a/svvpi/includes/orig/sv_vpi_user.h b/includes/orig/sv_vpi_user.h
similarity index 100%
rename from svvpi/includes/orig/sv_vpi_user.h
rename to includes/orig/sv_vpi_user.h
diff --git a/svvpi/includes/orig/vpi_compatibility.h b/includes/orig/vpi_compatibility.h
similarity index 100%
rename from svvpi/includes/orig/vpi_compatibility.h
rename to includes/orig/vpi_compatibility.h
diff --git a/svvpi/includes/orig/vpi_user.h b/includes/orig/vpi_user.h
similarity index 100%
rename from svvpi/includes/orig/vpi_user.h
rename to includes/orig/vpi_user.h
diff --git a/svvpi/includes/sv_vpi_user.h b/includes/sv_vpi_user.h
similarity index 100%
rename from svvpi/includes/sv_vpi_user.h
rename to includes/sv_vpi_user.h
diff --git a/svvpi/includes/veriuser.h b/includes/veriuser.h
similarity index 100%
rename from svvpi/includes/veriuser.h
rename to includes/veriuser.h
diff --git a/svvpi/includes/vpi_compatibility.h b/includes/vpi_compatibility.h
similarity index 100%
rename from svvpi/includes/vpi_compatibility.h
rename to includes/vpi_compatibility.h
diff --git a/svvpi/includes/vpi_user.h b/includes/vpi_user.h
similarity index 100%
rename from svvpi/includes/vpi_user.h
rename to includes/vpi_user.h
diff --git a/svvpi/svvpi.nim b/svvpi.nim
similarity index 100%
rename from svvpi/svvpi.nim
rename to svvpi.nim
diff --git a/svvpi.nimble b/svvpi.nimble
index 18cfd17..3926359 100644
--- a/svvpi.nimble
+++ b/svvpi.nimble
@@ -4,8 +4,12 @@ version       = "0.0.1"
 author        = "Kaushal Modi"
 description   = "Wrapper for SystemVerilog VPI headers vpi_user.h and sv_vpi_user.h"
 license       = "MIT"
-srcDir        = "svvpi"
-skipExt       = @["bkp"]
+# Wed May 12 22:46:45 EDT 2021 - kmodi
+# I cannot put all the code under an src/ directory otherwise I get
+# prompts on each "nimble install" -- https://github.com/nim-lang/nimble/issues/582#issuecomment-840248300
+# srcDir        = "src"
+installFiles  = @["svvpi.nim"]
+installDirs   = @["includes"]
 
 # Dependencies