diff --git a/CMakeLists.txt b/CMakeLists.txt
index 23c2a19..2031c5b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,4 +7,4 @@ add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/example)
 
 enable_testing()
 
-add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/test)
+add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/lib/tests)
diff --git a/cmake/argsparse-lib.cmake b/cmake/argsparse-lib.cmake
index 95f79b8..81506a3 100644
--- a/cmake/argsparse-lib.cmake
+++ b/cmake/argsparse-lib.cmake
@@ -2,13 +2,16 @@
 include(${CMAKE_CURRENT_LIST_DIR}/../cmake/getopt.cmake)
 
 # Main source directory
-include_directories(${CMAKE_CURRENT_LIST_DIR}/.. $ENV{EXTRA_INCLUDES})
+include_directories(
+    ${CMAKE_CURRENT_LIST_DIR}/../include
+    ${CMAKE_CURRENT_LIST_DIR}/../lib/inc
+    $ENV{EXTRA_INCLUDES})
 
 list(APPEND SourceFiles
-    ${CMAKE_CURRENT_LIST_DIR}/../argsparse.c
-    ${CMAKE_CURRENT_LIST_DIR}/../internal_funcs.c
+    ${CMAKE_CURRENT_LIST_DIR}/../lib/src/argsparse.c
+    ${CMAKE_CURRENT_LIST_DIR}/../lib/src/internal_funcs.c
 )
 
 add_library(${PROJECT_NAME}-lib ${SourceFiles})
 
-target_include_directories(${PROJECT_NAME}-lib PUBLIC ${CMAKE_CURRENT_LIST_DIR}/..)
\ No newline at end of file
+target_include_directories(${PROJECT_NAME}-lib PUBLIC ${CMAKE_CURRENT_LIST_DIR}/../include)
\ No newline at end of file
diff --git a/argsparse.h b/include/argsparse.h
similarity index 100%
rename from argsparse.h
rename to include/argsparse.h
diff --git a/internal_funcs.h b/lib/inc/internal_funcs.h
similarity index 100%
rename from internal_funcs.h
rename to lib/inc/internal_funcs.h
diff --git a/internal_types.h b/lib/inc/internal_types.h
similarity index 100%
rename from internal_types.h
rename to lib/inc/internal_types.h
diff --git a/iterate.h b/lib/inc/iterate.h
similarity index 100%
rename from iterate.h
rename to lib/inc/iterate.h
diff --git a/argsparse.c b/lib/src/argsparse.c
similarity index 100%
rename from argsparse.c
rename to lib/src/argsparse.c
diff --git a/internal_funcs.c b/lib/src/internal_funcs.c
similarity index 100%
rename from internal_funcs.c
rename to lib/src/internal_funcs.c
diff --git a/test/CMakeLists.txt b/lib/tests/CMakeLists.txt
similarity index 83%
rename from test/CMakeLists.txt
rename to lib/tests/CMakeLists.txt
index 8a8ab55..db0c036 100644
--- a/test/CMakeLists.txt
+++ b/lib/tests/CMakeLists.txt
@@ -5,10 +5,10 @@ set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED YES)
 
-include(${CMAKE_CURRENT_LIST_DIR}/../cmake/googletest.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/../../cmake/googletest.cmake)
 
 # Main source directory
-include_directories(${CMAKE_CURRENT_LIST_DIR}/..)
+include_directories(${CMAKE_CURRENT_LIST_DIR}/../../include)
 
 list(APPEND SourceFiles
     ${CMAKE_CURRENT_LIST_DIR}/TestMain.cpp
diff --git a/test/TestMain.cpp b/lib/tests/TestMain.cpp
similarity index 100%
rename from test/TestMain.cpp
rename to lib/tests/TestMain.cpp
diff --git a/test/argsparseTests.cpp b/lib/tests/argsparseTests.cpp
similarity index 100%
rename from test/argsparseTests.cpp
rename to lib/tests/argsparseTests.cpp
diff --git a/test/tokenize.c b/lib/tests/tokenize.c
similarity index 100%
rename from test/tokenize.c
rename to lib/tests/tokenize.c
diff --git a/test/tokenize.h b/lib/tests/tokenize.h
similarity index 100%
rename from test/tokenize.h
rename to lib/tests/tokenize.h