diff --git a/SConstruct b/SConstruct
index cb82381..c355fee 100644
--- a/SConstruct
+++ b/SConstruct
@@ -5,6 +5,11 @@ env = DefaultEnvironment(tools=['default', 'compilation_db'])
 env.CompilationDatabase()
 
 env.Append(CCFLAGS=["-Wall", "-Wextra", "-Werror", "-pedantic"])
+env.Append(CPPPATH=['.', 'include'])
 
-# Build the output program
-Program('vector.out', Glob('*.cpp'))
+# Build the test programs
+catch_cpp = "test/catch_amalgamated.cpp"
+Program('vector-test.out', [catch_cpp, 'test/vector-test.cpp'])
+
+# Build the library
+SharedLibrary('ged', Glob('cpp/*.cpp'))
diff --git a/cpp/Logger.cpp b/cpp/Logger.cpp
new file mode 100644
index 0000000..e69de29
diff --git a/cpp/Logger.os b/cpp/Logger.os
new file mode 100644
index 0000000..38f0a05
Binary files /dev/null and b/cpp/Logger.os differ
diff --git a/include/Logger.h b/include/Logger.h
new file mode 100644
index 0000000..e69de29
diff --git a/Vector.h b/include/Vector.h
similarity index 100%
rename from Vector.h
rename to include/Vector.h
diff --git a/catch_amalgamated.cpp b/test/catch_amalgamated.cpp
similarity index 100%
rename from catch_amalgamated.cpp
rename to test/catch_amalgamated.cpp
diff --git a/catch_amalgamated.hpp b/test/catch_amalgamated.hpp
similarity index 100%
rename from catch_amalgamated.hpp
rename to test/catch_amalgamated.hpp
diff --git a/test.cpp b/test/vector-test.cpp
similarity index 99%
rename from test.cpp
rename to test/vector-test.cpp
index c996635..fd2fd41 100644
--- a/test.cpp
+++ b/test/vector-test.cpp
@@ -377,4 +377,4 @@ SCENARIO("Constructors and Destructors are called as expected", "[vector]") {
             }
         }
     }
-}
\ No newline at end of file
+}