diff --git a/application/argumentparser.cpp b/application/argumentparser.cpp
index 222ffe6..aa0d6a4 100644
--- a/application/argumentparser.cpp
+++ b/application/argumentparser.cpp
@@ -2,8 +2,8 @@
 #include "commandlineutils.h"
 #include "failure.h"
 
-#include "../conversion/stringconversion.h"
-#include "../misc/random.h"
+#include "c++utilities/conversion/stringconversion.h"
+#include "c++utilities/misc/random.h"
 
 #include <algorithm>
 #include <vector>
diff --git a/chrono/datetime.cpp b/chrono/datetime.cpp
index 3f1e4ce..d0f4bb6 100644
--- a/chrono/datetime.cpp
+++ b/chrono/datetime.cpp
@@ -1,6 +1,6 @@
 #include "datetime.h"
 
-#include "../conversion/stringconversion.h"
+#include "c++utilities/conversion/stringconversion.h"
 
 #include <sstream>
 #include <iomanip>
@@ -49,9 +49,13 @@ inline bool inRangeExclMax(num1 val, num2 min, num3 max)
  */
 DateTime DateTime::fromTimeStamp(time_t timeStamp)
 {
-    struct tm *timeinfo = localtime(&timeStamp);
-    return DateTime::fromDateAndTime(timeinfo->tm_year + 1900, timeinfo->tm_mon + 1, timeinfo->tm_mday,
-                    timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec < 60 ? timeinfo->tm_sec : 59, 0);
+    if(timeStamp) {
+        struct tm *timeinfo = localtime(&timeStamp);
+        return DateTime::fromDateAndTime(timeinfo->tm_year + 1900, timeinfo->tm_mon + 1, timeinfo->tm_mday,
+                        timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec < 60 ? timeinfo->tm_sec : 59, 0);
+    } else {
+        return DateTime();
+    }
 }
 
 /*!
diff --git a/chrono/datetime.h b/chrono/datetime.h
index 053f9c5..953d764 100644
--- a/chrono/datetime.h
+++ b/chrono/datetime.h
@@ -3,7 +3,7 @@
 
 #include "timespan.h"
 
-#include "../conversion/types.h"
+#include "c++utilities/conversion/types.h"
 
 #include <string>
 
diff --git a/chrono/period.h b/chrono/period.h
index b331e89..f34e3b4 100644
--- a/chrono/period.h
+++ b/chrono/period.h
@@ -3,7 +3,7 @@
 
 #include "datetime.h"
 
-#include "../application/global.h"
+#include "c++utilities/application/global.h"
 
 namespace ChronoUtilities {
 
diff --git a/chrono/timespan.cpp b/chrono/timespan.cpp
index 06bce1e..58daf01 100644
--- a/chrono/timespan.cpp
+++ b/chrono/timespan.cpp
@@ -1,6 +1,6 @@
 #include "timespan.h"
 
-#include "../conversion/stringconversion.h"
+#include "c++utilities/conversion/stringconversion.h"
 
 #include <sstream>
 #include <cmath>
diff --git a/chrono/timespan.h b/chrono/timespan.h
index ea715e2..2441bb6 100644
--- a/chrono/timespan.h
+++ b/chrono/timespan.h
@@ -1,8 +1,8 @@
 #ifndef TIMESPAN_H
 #define TIMESPAN_H
 
-#include "../application/global.h"
-#include "../conversion/types.h"
+#include "c++utilities/application/global.h"
+#include "c++utilities/conversion/types.h"
 
 #include <string>
 
diff --git a/conversion/binaryconversion.h b/conversion/binaryconversion.h
index 1e4ea3b..39ce768 100644
--- a/conversion/binaryconversion.h
+++ b/conversion/binaryconversion.h
@@ -3,7 +3,7 @@
 
 #include "types.h"
 
-#include "../application/global.h"
+#include "c++utilities/application/global.h"
 
 #if defined(__BYTE_ORDER__) && defined(__FLOAT_WORD_ORDER__)
 #   if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
diff --git a/conversion/binaryconversionprivate.h b/conversion/binaryconversionprivate.h
index c13e9d8..05b0c36 100644
--- a/conversion/binaryconversionprivate.h
+++ b/conversion/binaryconversionprivate.h
@@ -6,7 +6,7 @@
 
 #include "types.h"
 
-#include "../application/global.h"
+#include "c++utilities/application/global.h"
 
 /*!
  * \brief Returns a 16-bit signed integer converted from two bytes at a specified position in a char array.
diff --git a/conversion/conversionexception.h b/conversion/conversionexception.h
index e6b3ee0..7d99c7a 100644
--- a/conversion/conversionexception.h
+++ b/conversion/conversionexception.h
@@ -1,7 +1,7 @@
 #ifndef CONVERSIONEXCEPTION_H
 #define CONVERSIONEXCEPTION_H
 
-#include "../application/global.h"
+#include "c++utilities/application/global.h"
 
 #include <stdexcept>
 #include <string>
diff --git a/conversion/stringconversion.cpp b/conversion/stringconversion.cpp
index 0926fc3..dd0d78c 100644
--- a/conversion/stringconversion.cpp
+++ b/conversion/stringconversion.cpp
@@ -1,6 +1,6 @@
 #include "stringconversion.h"
 
-#include "../misc/memory.h"
+#include "c++utilities/misc/memory.h"
 
 #include <sstream>
 #include <iomanip>
diff --git a/conversion/widen.h b/conversion/widen.h
index f3833e0..6a46e7b 100644
--- a/conversion/widen.h
+++ b/conversion/widen.h
@@ -1,7 +1,7 @@
 #ifndef WIDEN_H
 #define WIDEN_H
 
-#include "../application/global.h"
+#include "c++utilities/application/global.h"
 
 #include <string>
 #include <vector>
diff --git a/io/ansiescapecodes.cpp b/io/ansiescapecodes.cpp
index 4d84f5f..5c35307 100644
--- a/io/ansiescapecodes.cpp
+++ b/io/ansiescapecodes.cpp
@@ -1,3 +1 @@
 #include "ansiescapecodes.h"
-
-
diff --git a/io/ansiescapecodes.h b/io/ansiescapecodes.h
index 26c2256..45bc271 100644
--- a/io/ansiescapecodes.h
+++ b/io/ansiescapecodes.h
@@ -1,7 +1,7 @@
 #ifndef ANSIESCAPECODES
 #define ANSIESCAPECODES
 
-#include "../application/global.h"
+#include "c++utilities/application/global.h"
 
 #include <ostream>
 
diff --git a/io/binaryreader.cpp b/io/binaryreader.cpp
index bf63fb3..feea586 100644
--- a/io/binaryreader.cpp
+++ b/io/binaryreader.cpp
@@ -1,7 +1,7 @@
 #include "binaryreader.h"
-#include "misc/memory.h"
 
-#include <conversion/conversionexception.h>
+#include "c++utilities/misc/memory.h"
+#include "c++utilities/conversion/conversionexception.h"
 
 #include <sstream>
 #include <cstring>
diff --git a/io/binaryreader.h b/io/binaryreader.h
index 719fe6c..bba0089 100644
--- a/io/binaryreader.h
+++ b/io/binaryreader.h
@@ -1,9 +1,9 @@
 #ifndef BINERYREADER_H
 #define BINERYREADER_H
 
-#include "../application/global.h"
-#include "../conversion/types.h"
-#include "../conversion/binaryconversion.h"
+#include "c++utilities/application/global.h"
+#include "c++utilities/conversion/types.h"
+#include "c++utilities/conversion/binaryconversion.h"
 
 #include <vector>
 #include <string>
diff --git a/io/binarywriter.cpp b/io/binarywriter.cpp
index 37085cf..fdd8c8a 100644
--- a/io/binarywriter.cpp
+++ b/io/binarywriter.cpp
@@ -1,6 +1,6 @@
 #include "binarywriter.h"
 
-#include "../conversion/conversionexception.h"
+#include "c++utilities/conversion/conversionexception.h"
 
 #include <cstring>
 #include <memory>
diff --git a/io/binarywriter.h b/io/binarywriter.h
index 3bcb9dc..632167b 100644
--- a/io/binarywriter.h
+++ b/io/binarywriter.h
@@ -1,9 +1,9 @@
 #ifndef BINARYWRITER_H
 #define BINARYWRITER_H
 
-#include "../application/global.h"
-#include "../conversion/types.h"
-#include "../conversion/binaryconversion.h"
+#include "c++utilities/application/global.h"
+#include "c++utilities/conversion/types.h"
+#include "c++utilities/conversion/binaryconversion.h"
 
 #include <vector>
 #include <string>
diff --git a/io/bitreader.h b/io/bitreader.h
index bec1c65..c138251 100644
--- a/io/bitreader.h
+++ b/io/bitreader.h
@@ -1,8 +1,8 @@
 #ifndef IOUTILITIES_BITREADER_H
 #define IOUTILITIES_BITREADER_H
 
-#include "../conversion/types.h"
-#include "../application/global.h"
+#include "c++utilities/conversion/types.h"
+#include "c++utilities/application/global.h"
 
 #include <ios>
 
diff --git a/io/copy.h b/io/copy.h
index d159c62..81310c8 100644
--- a/io/copy.h
+++ b/io/copy.h
@@ -1,7 +1,7 @@
 #ifndef IOUTILITIES_COPY_H
 #define IOUTILITIES_COPY_H
 
-#include "../application/global.h"
+#include "c++utilities/application/global.h"
 
 #include <iostream>
 #include <functional>
diff --git a/io/inifile.h b/io/inifile.h
index d5605eb..1076424 100644
--- a/io/inifile.h
+++ b/io/inifile.h
@@ -1,7 +1,7 @@
 #ifndef IOUTILITIES_INIFILE_H
 #define IOUTILITIES_INIFILE_H
 
-#include "../application/global.h"
+#include "c++utilities/application/global.h"
 
 #include <map>
 #include <string>
diff --git a/io/path.cpp b/io/path.cpp
index 1a1ccc9..435a8b9 100644
--- a/io/path.cpp
+++ b/io/path.cpp
@@ -1,7 +1,7 @@
 #include "path.h"
 
-#include "../application/global.h"
-#include "../conversion/widen.h"
+#include "c++utilities/application/global.h"
+#include "c++utilities/conversion/widen.h"
 
 #include <string>
 #include <sstream>
diff --git a/io/path.h b/io/path.h
index fce37c6..90a38dd 100644
--- a/io/path.h
+++ b/io/path.h
@@ -4,12 +4,11 @@
 #include "binarywriter.h"
 #include "binaryreader.h"
 
-#include "../application/global.h"
+#include "c++utilities/application/global.h"
 
 #include <string>
 
-namespace IoUtilities
-{
+namespace IoUtilities {
 
 LIB_EXPORT std::string fileName(const std::string &path);
 LIB_EXPORT void removeInvalidChars(std::string &path);
diff --git a/math/math.h b/math/math.h
index 11711d0..0a0006f 100644
--- a/math/math.h
+++ b/math/math.h
@@ -1,10 +1,9 @@
 #ifndef MATHUTILITIES_H
 #define MATHUTILITIES_H
 
-#include "application/global.h"
+#include "c++utilities/application/global.h"
 
-namespace MathUtilities
-{
+namespace MathUtilities {
 
 LIB_EXPORT int random(int lowerbounds, int upperbounds);
 
diff --git a/misc/random.h b/misc/random.h
index 461a501..871486e 100644
--- a/misc/random.h
+++ b/misc/random.h
@@ -1,12 +1,11 @@
 #ifndef RANDOMUTILS_H
 #define RANDOMUTILS_H
 
-#include "../application/global.h"
+#include "c++utilities/application/global.h"
 
 #include <functional>
 
-namespace RandomUtilities
-{
+namespace RandomUtilities {
 
 LIB_EXPORT void generateRandomCharacterSequence(char *result, int length, bool useSmallLetters = true, bool useCapitalLetters = true, bool useNumbers = true, bool useSymbols = true, bool useAtLeastOneOfEachCategory = true);
 LIB_EXPORT void generateRandomCharacterSequence(char *result, int length, std::function<int ()> randomizer, int maximalRandomNumber, bool useSmallLetters = true, bool useCapitalLetters = true, bool useNumbers = true, bool useSymbols = true, bool useAtLeastOneOfEachCategory = true);