diff --git a/CMakeLists.txt b/CMakeLists.txt
index 47f5716..1446c37 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.9)
 # project properties, version etc
-project(test_shared_library LANGUAGES C VERSION 1.0.3 DESCRIPTION "Shared C Library for testing of various cmake configurations")
+project(test_shared_library LANGUAGES C VERSION 1.1.1 DESCRIPTION "Shared C Library for testing of various cmake configurations")
 set(CMAKE_C_STANDARD 99)
 # include GNU Install dirs
 include(GNUInstallDirs)
@@ -8,22 +8,22 @@ include(GNUInstallDirs)
 enable_testing()
 
 # define library
-add_library(test_shared_library SHARED test_shared_library.c test_shared_library.h)
+add_library(test_shared_library SHARED src/test_shared_library.c include/test_shared_library.h)
 
 # library properties - dynamic
 set_target_properties(test_shared_library PROPERTIES
         VERSION ${PROJECT_VERSION}
         SOVERSION 1
-        PUBLIC_HEADER test_shared_library.h)
+        PUBLIC_HEADER include/test_shared_library.h)
 
 # pkg-config stuff
 configure_file(test_shared_library.pc.in test_shared_library.pc @ONLY)
 
 #target_include_directories(test_shared_library PRIVATE .)
 target_include_directories(${PROJECT_NAME} PUBLIC
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-        $<INSTALL_INTERFACE:>
-        PRIVATE .)
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+        $<INSTALL_INTERFACE:include>
+        PRIVATE src)
 
 # export native cmake package
 install(TARGETS test_shared_library EXPORT test_shared_libraryConfig
diff --git a/test_shared_library.h b/include/test_shared_library.h
similarity index 100%
rename from test_shared_library.h
rename to include/test_shared_library.h
diff --git a/test_shared_library.c b/src/test_shared_library.c
similarity index 100%
rename from test_shared_library.c
rename to src/test_shared_library.c