diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index 30aa626..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <Objective-C-extensions>
-      <file>
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
-      </file>
-      <class>
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
-      </class>
-      <extensions>
-        <pair source="cpp" header="h" fileNamingConvention="NONE" />
-        <pair source="c" header="h" fileNamingConvention="NONE" />
-      </extensions>
-    </Objective-C-extensions>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 94a25f7..7d34eb9 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,5 +2,6 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/libcron/externals/date" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/libcron/CMakeLists.txt b/libcron/CMakeLists.txt
index 7623cf1..feb4610 100644
--- a/libcron/CMakeLists.txt
+++ b/libcron/CMakeLists.txt
@@ -9,22 +9,24 @@ else()
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic")
 endif()
 
-include_directories(${CMAKE_CURRENT_LIST_DIR}/externals/date/include)
-
 add_library(${PROJECT_NAME}
-        Cron.h
-        Task.h
-        CronData.h
-        TimeTypes.h
-        CronData.cpp
-        CronSchedule.cpp
-        CronSchedule.h
-        DateTime.h
-        Task.cpp
-        CronClock.h
-		CronClock.cpp)
+		include/libcron/Cron.h
+		include/libcron/CronClock.h
+		include/libcron/CronData.h
+		include/libcron/CronSchedule.h
+		include/libcron/DateTime.h
+		include/libcron/Task.h
+		include/libcron/TimeTypes.h
+		src/CronClock.cpp
+		src/CronData.cpp
+		src/CronSchedule.cpp
+		src/Task.cpp)
+
+target_include_directories(${PROJECT_NAME}
+		PRIVATE ${CMAKE_CURRENT_LIST_DIR}/externals/date/include
+		PUBLIC ${CMAKE_CURRENT_LIST_DIR}/include)
 
 set_target_properties(${PROJECT_NAME} PROPERTIES
-        ARCHIVE_OUTPUT_DIRECTORY "${OUTPUT_LOCATION}"
-        LIBRARY_OUTPUT_DIRECTORY "${OUTPUT_LOCATION}"
-        RUNTIME_OUTPUT_DIRECTORY "${OUTPUT_LOCATION}")
\ No newline at end of file
+        ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/out"
+        LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/out"
+        RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/out")
\ No newline at end of file
diff --git a/libcron/Cron.h b/libcron/include/libcron/Cron.h
similarity index 100%
rename from libcron/Cron.h
rename to libcron/include/libcron/Cron.h
diff --git a/libcron/CronClock.h b/libcron/include/libcron/CronClock.h
similarity index 100%
rename from libcron/CronClock.h
rename to libcron/include/libcron/CronClock.h
diff --git a/libcron/CronData.h b/libcron/include/libcron/CronData.h
similarity index 99%
rename from libcron/CronData.h
rename to libcron/include/libcron/CronData.h
index 4f83c65..c402517 100644
--- a/libcron/CronData.h
+++ b/libcron/include/libcron/CronData.h
@@ -4,7 +4,7 @@
 #include <regex>
 #include <string>
 #include <vector>
-#include "TimeTypes.h"
+#include <libcron/TimeTypes.h>
 
 namespace libcron
 {
diff --git a/libcron/CronSchedule.h b/libcron/include/libcron/CronSchedule.h
similarity index 96%
rename from libcron/CronSchedule.h
rename to libcron/include/libcron/CronSchedule.h
index e619167..1c6fe97 100644
--- a/libcron/CronSchedule.h
+++ b/libcron/include/libcron/CronSchedule.h
@@ -1,17 +1,17 @@
 #pragma once
 
-#include "CronData.h"
+#include "libcron/CronData.h"
 #include <chrono>
-#ifdef _WIN32
-#pragma warning(push)
-#pragma warning(disable:4244)
-#endif
-#include <date/date.h>
-#ifdef _WIN32
-#pragma warning(pop)
+#ifdef _WIN32
+#pragma warning(push)
+#pragma warning(disable:4244)
+#endif
+#include <date/date.h>
+#ifdef _WIN32
+#pragma warning(pop)
 #endif
 
-#include "DateTime.h"
+#include "libcron/DateTime.h"
 
 namespace libcron
 {
diff --git a/libcron/DateTime.h b/libcron/include/libcron/DateTime.h
similarity index 100%
rename from libcron/DateTime.h
rename to libcron/include/libcron/DateTime.h
diff --git a/libcron/Task.h b/libcron/include/libcron/Task.h
similarity index 100%
rename from libcron/Task.h
rename to libcron/include/libcron/Task.h
diff --git a/libcron/TimeTypes.h b/libcron/include/libcron/TimeTypes.h
similarity index 100%
rename from libcron/TimeTypes.h
rename to libcron/include/libcron/TimeTypes.h
diff --git a/libcron/CronClock.cpp b/libcron/src/CronClock.cpp
similarity index 96%
rename from libcron/CronClock.cpp
rename to libcron/src/CronClock.cpp
index 2933777..9aeb00f 100644
--- a/libcron/CronClock.cpp
+++ b/libcron/src/CronClock.cpp
@@ -1,8 +1,8 @@
-#include "CronClock.h"
+#include "libcron/CronClock.h"
 
 #ifdef WIN32
-#ifndef NOMINMAX
-#define NOMINMAX
+#ifndef NOMINMAX
+#define NOMINMAX
 #endif
 #define WIN32_LEAN_AND_MEAN 
 #include <Windows.h>
diff --git a/libcron/CronData.cpp b/libcron/src/CronData.cpp
similarity index 99%
rename from libcron/CronData.cpp
rename to libcron/src/CronData.cpp
index e7f4082..6c08f59 100644
--- a/libcron/CronData.cpp
+++ b/libcron/src/CronData.cpp
@@ -1,5 +1,5 @@
 #include <date/date.h>
-#include "CronData.h"
+#include "libcron/CronData.h"
 
 using namespace date;
 
diff --git a/libcron/CronSchedule.cpp b/libcron/src/CronSchedule.cpp
similarity index 98%
rename from libcron/CronSchedule.cpp
rename to libcron/src/CronSchedule.cpp
index f2a5971..5da19d6 100644
--- a/libcron/CronSchedule.cpp
+++ b/libcron/src/CronSchedule.cpp
@@ -1,4 +1,4 @@
-#include "CronSchedule.h"
+#include "libcron/CronSchedule.h"
 #include <tuple>
 
 using namespace std::chrono;
diff --git a/libcron/Task.cpp b/libcron/src/Task.cpp
similarity index 98%
rename from libcron/Task.cpp
rename to libcron/src/Task.cpp
index fc0b038..69171c0 100644
--- a/libcron/Task.cpp
+++ b/libcron/src/Task.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "Task.h"
+#include "libcron/Task.h"
 
 using namespace std::chrono;
 
diff --git a/test/CronDataTest.cpp b/test/CronDataTest.cpp
index 92a93c1..74d7b83 100644
--- a/test/CronDataTest.cpp
+++ b/test/CronDataTest.cpp
@@ -2,8 +2,8 @@
 
 #include <catch.hpp>
 #include <date/date.h>
-#include <libcron/Cron.h>
-#include <libcron/CronData.h>
+#include <libcron/include/libcron/Cron.h>
+#include <libcron/include/libcron/CronData.h>
 
 using namespace libcron;
 using namespace date;
diff --git a/test/CronScheduleTest.cpp b/test/CronScheduleTest.cpp
index 6b109b3..c7347af 100644
--- a/test/CronScheduleTest.cpp
+++ b/test/CronScheduleTest.cpp
@@ -1,7 +1,7 @@
 #include <catch.hpp>
 #include <chrono>
 #include <date/date.h>
-#include <libcron/Cron.h>
+#include <libcron/include/libcron/Cron.h>
 #include <iostream>
 
 using namespace libcron;
diff --git a/test/CronTest.cpp b/test/CronTest.cpp
index b1ee940..18f1f58 100644
--- a/test/CronTest.cpp
+++ b/test/CronTest.cpp
@@ -1,5 +1,5 @@
 #include <catch.hpp>
-#include <libcron/Cron.h>
+#include <libcron/include/libcron/Cron.h>
 #include <thread>
 #include <iostream>