diff --git a/language-C++/Memory/src/Memory.Aux.cpp b/C++/Memory.Aux.cpp
similarity index 100%
rename from language-C++/Memory/src/Memory.Aux.cpp
rename to C++/Memory.Aux.cpp
diff --git a/language-C++/Memory/src/Memory.Test.cpp b/C++/Memory.Test.cpp
similarity index 100%
rename from language-C++/Memory/src/Memory.Test.cpp
rename to C++/Memory.Test.cpp
diff --git a/language-C++/Memory/src/Memory.h b/C++/Memory.h
similarity index 100%
rename from language-C++/Memory/src/Memory.h
rename to C++/Memory.h
diff --git a/language-C++/src/main.cpp b/C++/main.cpp
similarity index 100%
rename from language-C++/src/main.cpp
rename to C++/main.cpp
diff --git a/language-Swift/Memory/src/Memory.Aux.swift b/Swift/Memory.Aux.swift
similarity index 100%
rename from language-Swift/Memory/src/Memory.Aux.swift
rename to Swift/Memory.Aux.swift
diff --git a/language-Swift/Memory/src/Memory.Test.swift b/Swift/Memory.Test.swift
similarity index 100%
rename from language-Swift/Memory/src/Memory.Test.swift
rename to Swift/Memory.Test.swift
diff --git a/language-Swift/src/main.swift b/Swift/main.swift
similarity index 100%
rename from language-Swift/src/main.swift
rename to Swift/main.swift
diff --git a/gen-C++ b/gen-C++
index 924cd47..5167d64 100755
--- a/gen-C++
+++ b/gen-C++
@@ -1,6 +1,6 @@
 c++ -o test_memory_C++ \
   -std=c++11 \
-  -Ilanguage-C++/Memory/src \
-  language-C++/Memory/src/Memory.Aux.cpp \
-  language-C++/Memory/src/Memory.Test.cpp \
-  language-C++/src/main.cpp
+  -IC++ \
+  C++/Memory.Aux.cpp \
+  C++/Memory.Test.cpp \
+  C++/main.cpp
diff --git a/gen-Swift b/gen-Swift
index 0622974..4f436fb 100755
--- a/gen-Swift
+++ b/gen-Swift
@@ -1,4 +1,4 @@
 swiftc -o test_memory_Swift \
-  language-Swift/Memory/src/Memory.Aux.swift \
-  language-Swift/Memory/src/Memory.Test.swift \
-  language-Swift/src/main.swift
+  Swift/Memory.Aux.swift \
+  Swift/Memory.Test.swift \
+  Swift/main.swift