diff --git a/diaspora2hugo b/diaspora2hugo
deleted file mode 160000
index abe322f..0000000
--- a/diaspora2hugo
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit abe322f45bff05b42da71271186a623d5e511428
diff --git a/makefile b/makefile
index 5ea9a0e..52da372 100644
--- a/makefile
+++ b/makefile
@@ -18,23 +18,23 @@ copy-version-file-to-build-dir:
 all: http
 	cd $(BUILDDIR) && \
 	$(VOC) -s \
-		../vpkGit.Mod \
-		../vpkFsHelper.Mod \
-		../vpkConf.Mod \
-		../vpkUserDetails.Mod \
-		../vpkSettings.Mod \
-		../vpkTime.Mod \
-		../vpkLogger.Mod \
+		../src/vpkGit.Mod \
+		../src/vpkFsHelper.Mod \
+		../src/vpkConf.Mod \
+		../src/vpkUserDetails.Mod \
+		../src/vpkSettings.Mod \
+		../src/vpkTime.Mod \
+		../src/vpkLogger.Mod \
 		../lists/src/Sys.Mod \
 		../lists/src/List.Mod \
 		../lists/src/strutils.Mod \
-		../vpkCharacterStack.Mod \
-		../vpkJsonParser.Mod \
-		../vpkFileManager.Mod \
-		../vpkPackageResolver.Mod \
-		../vpkDependencyResolver.Mod \
-		../vpkPackageFileParser.Mod \
-		../vipack.Mod -m
+		../src/vpkCharacterStack.Mod \
+		../src/vpkJsonParser.Mod \
+		../src/vpkFileManager.Mod \
+		../src/vpkPackageResolver.Mod \
+		../src/vpkDependencyResolver.Mod \
+		../src/vpkPackageFileParser.Mod \
+		../src/vipack.Mod -m
 
 
 run:
@@ -43,24 +43,24 @@ run:
 
 http: clean
 	cd $(BUILDDIR) && \
-		$(VOC) -s ../vpkTime.Mod \
-			../vpkLogger.Mod \
+		$(VOC) -s ../src/vpkTime.Mod \
+			../src/vpkLogger.Mod \
 			../Internet/src/types.Mod \
 			../Internet/src/sockets.Mod \
 			../Internet/src/netdb.Mod \
 			../Internet/src/Internet.Mod \
-			../vpkHttp.Mod
+			../src/vpkHttp.Mod
 
 json:
 	cd $(BUILDDIR) && \
 		$(VOC) -s \
-			../vpkTime.Mod \
-			../vpkLogger.Mod \
-			../diaspora2hugo/src/lists/Sys.Mod \
-			../diaspora2hugo/src/lists/List.Mod \
-			../diaspora2hugo/src/lists/strutils.Mod \
-			../vpkCharacterStack.Mod \
-			../vpkJsonParser.Mod
+			../src/vpkTime.Mod \
+			../src/vpkLogger.Mod \
+			../lists/src/Sys.Mod \
+			../lists/src/List.Mod \
+			../lists/src/strutils.Mod \
+			../src/vpkCharacterStack.Mod \
+			../src/vpkJsonParser.Mod
 
 clean:
 	if [ -d "$(BUILDDIR)" ]; then rm -rf $(BUILDDIR); fi
diff --git a/vipack.Mod b/src/vipack.Mod
similarity index 100%
rename from vipack.Mod
rename to src/vipack.Mod
diff --git a/vpkCharacterStack.Mod b/src/vpkCharacterStack.Mod
similarity index 100%
rename from vpkCharacterStack.Mod
rename to src/vpkCharacterStack.Mod
diff --git a/vpkConf.Mod b/src/vpkConf.Mod
similarity index 100%
rename from vpkConf.Mod
rename to src/vpkConf.Mod
diff --git a/vpkDependencyResolver.Mod b/src/vpkDependencyResolver.Mod
similarity index 100%
rename from vpkDependencyResolver.Mod
rename to src/vpkDependencyResolver.Mod
diff --git a/vpkFileManager.Mod b/src/vpkFileManager.Mod
similarity index 100%
rename from vpkFileManager.Mod
rename to src/vpkFileManager.Mod
diff --git a/vpkFsHelper.Mod b/src/vpkFsHelper.Mod
similarity index 100%
rename from vpkFsHelper.Mod
rename to src/vpkFsHelper.Mod
diff --git a/vpkGit.Mod b/src/vpkGit.Mod
similarity index 100%
rename from vpkGit.Mod
rename to src/vpkGit.Mod
diff --git a/vpkHttp.Mod b/src/vpkHttp.Mod
similarity index 100%
rename from vpkHttp.Mod
rename to src/vpkHttp.Mod
diff --git a/vpkJsonParser.Mod b/src/vpkJsonParser.Mod
similarity index 100%
rename from vpkJsonParser.Mod
rename to src/vpkJsonParser.Mod
diff --git a/vpkLogger.Mod b/src/vpkLogger.Mod
similarity index 100%
rename from vpkLogger.Mod
rename to src/vpkLogger.Mod
diff --git a/vpkPackageFileParser.Mod b/src/vpkPackageFileParser.Mod
similarity index 100%
rename from vpkPackageFileParser.Mod
rename to src/vpkPackageFileParser.Mod
diff --git a/vpkPackageResolver.Mod b/src/vpkPackageResolver.Mod
similarity index 100%
rename from vpkPackageResolver.Mod
rename to src/vpkPackageResolver.Mod
diff --git a/vpkRemoteClient.Mod b/src/vpkRemoteClient.Mod
similarity index 100%
rename from vpkRemoteClient.Mod
rename to src/vpkRemoteClient.Mod
diff --git a/vpkSettings.Mod b/src/vpkSettings.Mod
similarity index 100%
rename from vpkSettings.Mod
rename to src/vpkSettings.Mod
diff --git a/vpkStringHelpers.Mod b/src/vpkStringHelpers.Mod
similarity index 100%
rename from vpkStringHelpers.Mod
rename to src/vpkStringHelpers.Mod
diff --git a/vpkTime.Mod b/src/vpkTime.Mod
similarity index 100%
rename from vpkTime.Mod
rename to src/vpkTime.Mod
diff --git a/vpkUserDetails.Mod b/src/vpkUserDetails.Mod
similarity index 100%
rename from vpkUserDetails.Mod
rename to src/vpkUserDetails.Mod
diff --git a/stringHelpers.Mod b/stringHelpers/stringHelpers.Mod
similarity index 99%
rename from stringHelpers.Mod
rename to stringHelpers/stringHelpers.Mod
index aa3c002..247988f 100644
--- a/stringHelpers.Mod
+++ b/stringHelpers/stringHelpers.Mod
@@ -156,7 +156,6 @@ BEGIN
   UNTIL (text[i] = 0X) OR (i = LEN(text));
 END dumpTextTill0;
 
-
 PROCEDURE textToPstrings*(VAR text: ARRAY OF CHAR): pstrings;
 VAR
   i, j, lineNum, start, number: INTEGER;
diff --git a/test.Mod b/test.Mod
deleted file mode 100644
index 2349afe..0000000
--- a/test.Mod
+++ /dev/null
@@ -1,15 +0,0 @@
-MODULE test;
-IMPORT Out;
-VAR
-    string: POINTER TO ARRAY OF CHAR;
-BEGIN
-    NEW(string, 42);
-    string[1] := "a";
-    Out.Char(string[1]);
-    Out.Ln();
-    Out.Int(ORD(string[1]), 10);
-    Out.Ln();
-    Out.Int(ORD(string[2]), 10);
-    Out.Ln();
-    COPY("Gago", string);
-END test.
\ No newline at end of file
diff --git a/time.Mod b/time.Mod
deleted file mode 100644
index 7e6b10e..0000000
--- a/time.Mod
+++ /dev/null
@@ -1,30 +0,0 @@
-MODULE time;
-IMPORT SYSTEM;
-
-PROCEDURE -Aincludesystime  '#include <sys/time.h>';  (* for gettimeofday *)
-PROCEDURE -Aincludetime     '#include <time.h>';      (* for localtime *)
-PROCEDURE -Aincludesystypes '#include <sys/types.h>';
-
-PROCEDURE -gettimeval "struct timeval tv; gettimeofday(&tv,0)";
-PROCEDURE -tvsec():  LONGINT   "tv.tv_sec";
-PROCEDURE -tvusec(): LONGINT   "tv.tv_usec";
-PROCEDURE -sectotm(s: LONGINT) "struct tm *time = localtime((time_t*)&s)";
-PROCEDURE -tmsec():  LONGINT   "(LONGINT)time->tm_sec";
-PROCEDURE -tmmin():  LONGINT   "(LONGINT)time->tm_min";
-PROCEDURE -tmhour(): LONGINT   "(LONGINT)time->tm_hour";
-PROCEDURE -tmmday(): LONGINT   "(LONGINT)time->tm_mday";
-PROCEDURE -tmmon():  LONGINT   "(LONGINT)time->tm_mon";
-PROCEDURE -tmyear(): LONGINT   "(LONGINT)time->tm_year";
-
-PROCEDURE Now*(VAR year, month, day, hour, min, sec: LONGINT);
-BEGIN
-  gettimeval; sectotm(tvsec());
-  year := tmyear() + 1900;
-  month := tmmon();
-  day := tmmday();
-  hour := tmhour();
-  min := tmmin();
-  sec := tmsec();
-END Now;
-
-END time.
diff --git a/vpkTest.Mod b/vpkTest.Mod
deleted file mode 100644
index 327b006..0000000
--- a/vpkTest.Mod
+++ /dev/null
@@ -1,15 +0,0 @@
-MODULE vpkTest;
-IMPORT Out;
-VAR
-    string: POINTER TO ARRAY OF CHAR;
-BEGIN
-    NEW(string, 42);
-    string[1] := "a";
-    Out.Char(string[1]);
-    Out.Ln();
-    Out.Int(ORD(string[1]), 10);
-    Out.Ln();
-    Out.Int(ORD(string[2]), 10);
-    Out.Ln();
-    COPY("Gago", string);
-END vpkTest.