diff --git a/.gitmodules b/.gitmodules
index ddde462..10f8f72 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "subprojects/minIni"]
-	path = subprojects/minIni
+[submodule "minIni"]
+	path = minIni
 	url = https://github.com/compuphase/minIni.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 15902b4..1406290 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,28 +5,28 @@ set(CMAKE_C_STANDARD 11)
 include(CTest)
 
 include_directories(
-  "${CMAKE_HOME_DIRECTORY}/subprojects/minIni/dev"
+  "${CMAKE_HOME_DIRECTORY}/minIni/dev"
 )
 
 add_library(
   ini-config STATIC
-  source/ini-config.c
-  source/ini-config.h
-  source/types/int.c
-  source/types/int.h
-  source/types/string.c
-  source/types/string.h
+  src/ini-config.c
+  src/ini-config.h
+  src/types/int.c
+  src/types/int.h
+  src/types/string.c
+  src/types/string.h
 )
 
 add_executable(
   test-int
-    subprojects/minIni/dev/minIni.h
-    subprojects/minIni/dev/minIni.c
+    minIni/dev/minIni.h
+    minIni/dev/minIni.c
     tests/test-int.c
-    source/ini-config.c
-    source/ini-config.h
-    source/types/int.c
-    source/types/int.h
+    src/ini-config.c
+    src/ini-config.h
+    src/types/int.c
+    src/types/int.h
 )
 
 set_target_properties (test-int PROPERTIES RUNTIME_OUTPUT_DIRECTORY tests)
diff --git a/minIni b/minIni
new file mode 160000
index 0000000..797be9d
--- /dev/null
+++ b/minIni
@@ -0,0 +1 @@
+Subproject commit 797be9d2b883222d387732df73945d52c99ec994
diff --git a/source/ini-config.c b/src/ini-config.c
similarity index 100%
rename from source/ini-config.c
rename to src/ini-config.c
diff --git a/source/ini-config.h b/src/ini-config.h
similarity index 100%
rename from source/ini-config.h
rename to src/ini-config.h
diff --git a/source/types/int.c b/src/types/int.c
similarity index 100%
rename from source/types/int.c
rename to src/types/int.c
diff --git a/source/types/int.h b/src/types/int.h
similarity index 100%
rename from source/types/int.h
rename to src/types/int.h
diff --git a/source/types/string.c b/src/types/string.c
similarity index 100%
rename from source/types/string.c
rename to src/types/string.c
diff --git a/source/types/string.h b/src/types/string.h
similarity index 100%
rename from source/types/string.h
rename to src/types/string.h
diff --git a/subprojects/minIni b/subprojects/minIni
deleted file mode 160000
index 755f9a8..0000000
--- a/subprojects/minIni
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 755f9a8b5c3b8d8ced9bd2d9173dd1d1cac8efc2