diff --git a/CMakeLists.txt b/CMakeLists.txt
index 15b37f43959520eda11f3121daf9811598a5a96f..fc313453074962b0ddd4a1800d036209b801801d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,6 +14,7 @@ set(SRC_FILES
 	componant/constantphase.cpp
 	componant/warburg.cpp
 	componant/paralellseriel.cpp
+	componant/finitetr.cpp
 	model.cpp
 	log.cpp
 	normalize.cpp
@@ -21,7 +22,6 @@ set(SRC_FILES
 	log.cpp
 	normalize.cpp
 	basicmath.cpp
-	finitetr.cpp
 	eistype.cpp
 	strops.cpp
 	translators.cpp
@@ -32,18 +32,19 @@ set(SRC_FILES
 set(API_HEADERS_CPP_DIR eisgenerator/)
 
 set(API_HEADERS_CPP
-	${API_HEADERS_CPP_DIR}/componant.h
-	${API_HEADERS_CPP_DIR}/cap.h
-	${API_HEADERS_CPP_DIR}/resistor.h
-	${API_HEADERS_CPP_DIR}/constantphase.h
-	${API_HEADERS_CPP_DIR}/warburg.h
+	${API_HEADERS_CPP_DIR}/componant/componant.h
+	${API_HEADERS_CPP_DIR}/componant/cap.h
+	${API_HEADERS_CPP_DIR}/componant/resistor.h
+	${API_HEADERS_CPP_DIR}/componant/constantphase.h
+	${API_HEADERS_CPP_DIR}/componant/warburg.h
+	${API_HEADERS_CPP_DIR}/componant/inductor.h
+	${API_HEADERS_CPP_DIR}/componant/finitetr.h
+	${API_HEADERS_CPP_DIR}/componant/paralellseriel.h
 	${API_HEADERS_CPP_DIR}/model.h
 	${API_HEADERS_CPP_DIR}/log.h
-	${API_HEADERS_CPP_DIR}/paralellseriel.h
 	${API_HEADERS_CPP_DIR}/basicmath.h
 	${API_HEADERS_CPP_DIR}/eistype.h
 	${API_HEADERS_CPP_DIR}/normalize.h
-	${API_HEADERS_CPP_DIR}/inductor.h
 	${API_HEADERS_CPP_DIR}/translators.h
 )
 
@@ -82,6 +83,7 @@ endif(WIN32)
 set(COMMON_COMPILE_FLAGS "-Wall -O2 -march=native -g")
 
 if(PROFILE_ENABLED)
+	message("Profileing enabled")
 	set(COMMON_COMPILE_FLAGS "${COMMON_COMPILE_FLAGS} -pg -fno-omit-frame-pointer")
 	set(COMMON_LINK_FLAGS "${COMMON_LINK_FLAGS} -pg -fno-omit-frame-pointer")
 endif(PROFILE_ENABLED)
diff --git a/componant/cap.cpp b/componant/cap.cpp
index 8fadbf759991e506523ea53600bc62b863b83f79..ff4e349400ec49a793904992fd13153532f862ad 100644
--- a/componant/cap.cpp
+++ b/componant/cap.cpp
@@ -1,5 +1,4 @@
-#include "cap.h"
-#include "strops.h"
+#include "componant/cap.h"
 #include <cstdlib>
 #include <math.h>
 #include <cassert>
diff --git a/componant/componant.cpp b/componant/componant.cpp
index 1d099f045a6fde7d16e8258df1093f9a5eefbec1..dcaed9a1c9020b8865d34322c46ffb4616d06a4e 100644
--- a/componant/componant.cpp
+++ b/componant/componant.cpp
@@ -1,14 +1,14 @@
-#include "componant.h"
+#include "componant/componant.h"
 #include <assert.h>
 #include <sstream>
-#include "paralellseriel.h"
-#include "resistor.h"
-#include "cap.h"
-#include "constantphase.h"
-#include "warburg.h"
+#include "componant/paralellseriel.h"
+#include "componant/resistor.h"
+#include "componant/cap.h"
+#include "componant/constantphase.h"
+#include "componant/warburg.h"
 #include "log.h"
-#include "inductor.h"
-#include "finitetr.h"
+#include "componant/inductor.h"
+#include "componant/finitetr.h"
 #include "randomgen.h"
 
 using namespace eis;
diff --git a/componant/constantphase.cpp b/componant/constantphase.cpp
index 5e68df6cdc4caddef89ee9b4365ff0ab6f8d9471..89fed415a6e0eda11a95e19bd71c043acaaf5396 100644
--- a/componant/constantphase.cpp
+++ b/componant/constantphase.cpp
@@ -1,5 +1,4 @@
-#include "constantphase.h"
-#include "strops.h"
+#include "componant/constantphase.h"
 #include <cstdlib>
 #include <string>
 #define _USE_MATH_DEFINES
diff --git a/finitetr.cpp b/componant/finitetr.cpp
similarity index 93%
rename from finitetr.cpp
rename to componant/finitetr.cpp
index 3d6a861bc383028ca098ec123e7e273621390f88..13d2767e1ed21cb33ec1c55ebd18b7da8d093392 100644
--- a/finitetr.cpp
+++ b/componant/finitetr.cpp
@@ -1,13 +1,11 @@
-#include "finitetr.h"
+#include "componant/finitetr.h"
 #include <cstdlib>
 #include <math.h>
 
-#include "eisgenerator/componant.h"
-#include "eisgenerator/paralellseriel.h"
-#include "eisgenerator/resistor.h"
-#include "paralellseriel.h"
-#include "cap.h"
-#include "resistor.h"
+#include "componant/componant.h"
+#include "componant/paralellseriel.h"
+#include "componant/resistor.h"
+#include "componant/cap.h"
 #include "log.h"
 #include "strops.h"
 
diff --git a/componant/inductor.cpp b/componant/inductor.cpp
index 39bf77bf742661c0cc1cd0f300fb7e88fa9a0ef1..d2d8ea134b6d9e3c4e69f683bcc57ae5c0bb5297 100644
--- a/componant/inductor.cpp
+++ b/componant/inductor.cpp
@@ -1,5 +1,4 @@
-#include "inductor.h"
-#include "strops.h"
+#include "componant/inductor.h"
 #include <cstdlib>
 #include <math.h>
 #include <cassert>
diff --git a/componant/paralellseriel.cpp b/componant/paralellseriel.cpp
index d40433b95269a5e8de1e6695625acd9958d84d57..24d006fa23a45090c8cd21f770deed8112a29765 100644
--- a/componant/paralellseriel.cpp
+++ b/componant/paralellseriel.cpp
@@ -1,5 +1,5 @@
-#include "paralellseriel.h"
-#include "componant.h"
+#include "componant/paralellseriel.h"
+#include "componant/componant.h"
 
 using namespace eis;
 
diff --git a/componant/resistor.cpp b/componant/resistor.cpp
index 96817141bd09f220afb491e46579176dbe193678..17fdbe9b830ccfc851234d56e4002084eb726542 100644
--- a/componant/resistor.cpp
+++ b/componant/resistor.cpp
@@ -1,5 +1,4 @@
-#include "resistor.h"
-#include "strops.h"
+#include "componant/resistor.h"
 #include <vector>
 #include <math.h>
 #include <cassert>
diff --git a/componant/warburg.cpp b/componant/warburg.cpp
index f0fc0f2d8c838aea3c7c73b6ff927e636c26d9ba..4471230b9677c23d59559f385117b7e8534c11fd 100644
--- a/componant/warburg.cpp
+++ b/componant/warburg.cpp
@@ -1,5 +1,4 @@
-#include "warburg.h"
-#include "strops.h"
+#include "componant/warburg.h"
 #include <cstdlib>
 #include <cmath>
 #include <cassert>
diff --git a/eisgenerator/cap.h b/eisgenerator/componant/cap.h
similarity index 100%
rename from eisgenerator/cap.h
rename to eisgenerator/componant/cap.h
diff --git a/eisgenerator/componant.h b/eisgenerator/componant/componant.h
similarity index 100%
rename from eisgenerator/componant.h
rename to eisgenerator/componant/componant.h
diff --git a/eisgenerator/constantphase.h b/eisgenerator/componant/constantphase.h
similarity index 100%
rename from eisgenerator/constantphase.h
rename to eisgenerator/componant/constantphase.h
diff --git a/eisgenerator/finitetr.h b/eisgenerator/componant/finitetr.h
similarity index 100%
rename from eisgenerator/finitetr.h
rename to eisgenerator/componant/finitetr.h
diff --git a/eisgenerator/inductor.h b/eisgenerator/componant/inductor.h
similarity index 100%
rename from eisgenerator/inductor.h
rename to eisgenerator/componant/inductor.h
diff --git a/eisgenerator/paralellseriel.h b/eisgenerator/componant/paralellseriel.h
similarity index 100%
rename from eisgenerator/paralellseriel.h
rename to eisgenerator/componant/paralellseriel.h
diff --git a/eisgenerator/resistor.h b/eisgenerator/componant/resistor.h
similarity index 100%
rename from eisgenerator/resistor.h
rename to eisgenerator/componant/resistor.h
diff --git a/eisgenerator/warburg.h b/eisgenerator/componant/warburg.h
similarity index 100%
rename from eisgenerator/warburg.h
rename to eisgenerator/componant/warburg.h
diff --git a/eisgenerator/model.h b/eisgenerator/model.h
index 4713f38596a4bd6658a080b7782e724cb46509bb..cd5c462e301464f2daf86a3d062234026b37b136 100644
--- a/eisgenerator/model.h
+++ b/eisgenerator/model.h
@@ -7,7 +7,7 @@
 #include <functional>
 
 #include "eistype.h"
-#include "componant.h"
+#include "componant/componant.h"
 
 namespace eis
 {
diff --git a/model.cpp b/model.cpp
index ce60208236846602a82ed8065d7f662d31ef790d..f334dc07a72a20b3ecd7e9dd7ec707a6f52ea2e7 100644
--- a/model.cpp
+++ b/model.cpp
@@ -13,20 +13,13 @@
 #include <dlfcn.h>
 #include <functional>
 
-#include "componant.h"
+#include "componant/componant.h"
 #include "eistype.h"
 #include "strops.h"
-#include "cap.h"
-#include "resistor.h"
-#include "inductor.h"
-#include "constantphase.h"
-#include "finitetr.h"
-#include "warburg.h"
-#include "paralellseriel.h"
+#include "componant/paralellseriel.h"
 #include "log.h"
 #include "normalize.h"
 #include "basicmath.h"
-#include "randomgen.h"
 #include "compile.h"
 #include "compcache.h"
 
diff --git a/translators.cpp b/translators.cpp
index 0b96031f815ec36eb506525601fdf38b492676e1..2b159bd1b260789d946f3bdb0cf926583ebf4233 100644
--- a/translators.cpp
+++ b/translators.cpp
@@ -9,7 +9,7 @@
 #include "strops.h"
 #include "eistype.h"
 #include "log.h"
-#include "componant.h"
+#include "componant/componant.h"
 
 namespace eis
 {