diff --git a/gen-C++ b/gen-C++
index 8bad2ba..415cab1 100755
--- a/gen-C++
+++ b/gen-C++
@@ -2,4 +2,4 @@ c++ -o test_memory_C++ \
   -Ilanguage-C++/Memory/src \
   language-C++/Memory/src/Memory.Aux.cpp \
   language-C++/Memory/src/Memory.Test.cpp \
-  language-C++/src/test.cpp
+  language-C++/src/main.cpp
diff --git a/gen-Swift b/gen-Swift
index 8a6c661..0622974 100755
--- a/gen-Swift
+++ b/gen-Swift
@@ -1,2 +1,4 @@
 swiftc -o test_memory_Swift \
-  language-Swift/src/test.swift
+  language-Swift/Memory/src/Memory.Aux.swift \
+  language-Swift/Memory/src/Memory.Test.swift \
+  language-Swift/src/main.swift
diff --git a/language-C++/src/test.cpp b/language-C++/src/main.cpp
similarity index 100%
rename from language-C++/src/test.cpp
rename to language-C++/src/main.cpp
diff --git a/language-Swift/Memory/src/Memory.Aux.swift b/language-Swift/Memory/src/Memory.Aux.swift
index 50f36a2..4d28373 100644
--- a/language-Swift/Memory/src/Memory.Aux.swift
+++ b/language-Swift/Memory/src/Memory.Aux.swift
@@ -1,22 +1,14 @@
-#include <map>
-#include "Memory.h"
-
-
-std::map<int, int> memory_generateConstPlayfield(
-  int n
-) {
-  std::map<int, int> idGroups;
-  int id = 0;
-  for (int gid = 0; gid < n; ++gid) {
-    idGroups[id++] = gid;
-    idGroups[id++] = gid;
-  }
-  return idGroups;
-}
-
 func memory_generateConstPlayfield(
-  n: Int
+  _ n: Int
 ) -> [Int: Int] {
   var idGroups = [Int: Int]()
+  var id = 0
+  for gid in stride(from: 0, to: n, by: 1) {
+    idGroups[id] = gid
+    id += 1
+    idGroups[id] = gid
+    id += 1
+  }
 
+  return idGroups
 }
diff --git a/language-Swift/Memory/src/Memory.Test.swift b/language-Swift/Memory/src/Memory.Test.swift
new file mode 100644
index 0000000..01b7cd6
--- /dev/null
+++ b/language-Swift/Memory/src/Memory.Test.swift
@@ -0,0 +1,14 @@
+func test_memory_generateConstPlayfield() -> String {
+  let idGroups = memory_generateConstPlayfield(2)
+  if (
+    idGroups.count == 4 &&
+    idGroups[0] == 0 &&
+    idGroups[1] == 0 &&
+    idGroups[2] == 1 &&
+    idGroups[3] == 1
+  ) {
+    return "OK: memory_generateConstPlayfield"
+  }
+  
+  return "ERR: memory_generateConstPlayfield";
+}
diff --git a/language-Swift/src/main.swift b/language-Swift/src/main.swift
new file mode 100644
index 0000000..a19c5a7
--- /dev/null
+++ b/language-Swift/src/main.swift
@@ -0,0 +1 @@
+print(test_memory_generateConstPlayfield())
diff --git a/language-Swift/src/test.swift b/language-Swift/src/test.swift
deleted file mode 100644
index 2deff4e..0000000
--- a/language-Swift/src/test.swift
+++ /dev/null
@@ -1,6 +0,0 @@
-print("Hello, world from Swift")
-/*
-  std::cout
-    << test_memory_generateConstPlayfield()
-    << std::endl;
-*/