diff --git a/CMakeLists.txt b/CMakeLists.txt
index 31dd253017f85501aa27ccbc57a8f9c4d42bbc0e..15b37f43959520eda11f3121daf9811598a5a96f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,14 +7,14 @@ set (CMAKE_CXX_STANDARD 20)
 option(PROFILE_ENABLED "instrument for gprof" OFF)
 
 set(SRC_FILES
-	componant.cpp
-	cap.cpp
-	inductor.cpp
-	resistor.cpp
-	constantphase.cpp
-	warburg.cpp
+	componant/componant.cpp
+	componant/cap.cpp
+	componant/inductor.cpp
+	componant/resistor.cpp
+	componant/constantphase.cpp
+	componant/warburg.cpp
+	componant/paralellseriel.cpp
 	model.cpp
-	paralellseriel.cpp
 	log.cpp
 	normalize.cpp
 	basicmath.cpp
@@ -88,7 +88,7 @@ endif(PROFILE_ENABLED)
 
 add_library(${PROJECT_NAME}_obj OBJECT ${SRC_FILES} ${API_HEADERS_CPP})
 target_link_libraries(${PROJECT_NAME}_obj ${LIBS})
-target_include_directories(${PROJECT_NAME}_obj PUBLIC eisgenerator)
+target_include_directories(${PROJECT_NAME}_obj PUBLIC eisgenerator .)
 set_target_properties(${PROJECT_NAME}_obj PROPERTIES POSITION_INDEPENDENT_CODE 1)
 set_target_properties(${PROJECT_NAME}_obj PROPERTIES COMPILE_FLAGS ${COMMON_COMPILE_FLAGS} LINK_FLAGS ${COMMON_LINK_FLAGS})
 add_library(${PROJECT_NAME} SHARED $<TARGET_OBJECTS:${PROJECT_NAME}_obj>)
diff --git a/cap.cpp b/componant/cap.cpp
similarity index 100%
rename from cap.cpp
rename to componant/cap.cpp
diff --git a/componant.cpp b/componant/componant.cpp
similarity index 100%
rename from componant.cpp
rename to componant/componant.cpp
diff --git a/constantphase.cpp b/componant/constantphase.cpp
similarity index 100%
rename from constantphase.cpp
rename to componant/constantphase.cpp
diff --git a/inductor.cpp b/componant/inductor.cpp
similarity index 100%
rename from inductor.cpp
rename to componant/inductor.cpp
diff --git a/paralellseriel.cpp b/componant/paralellseriel.cpp
similarity index 100%
rename from paralellseriel.cpp
rename to componant/paralellseriel.cpp
diff --git a/resistor.cpp b/componant/resistor.cpp
similarity index 100%
rename from resistor.cpp
rename to componant/resistor.cpp
diff --git a/warburg.cpp b/componant/warburg.cpp
similarity index 100%
rename from warburg.cpp
rename to componant/warburg.cpp