Cleaned up public interface

src/bakatools.h

@@ -1,19 +1,28 @@
 #pragma once
 
-#ifdef BKM_STRING
+#ifdef BKMOD_BASE
-    #include <bakatools/string/string_tools.h>
-#endif
-#ifdef BKM_BASE
     #include <bakatools/logging/log.h> 
     #include <bakatools/logging/assert.h>
 #endif
-#ifdef BKM_TIME_AND_THREADS
+#ifdef BKMOD_STRING
-    #include <bakatools/time/time.h>
+    #include <bakatools/string/string_tools.h>
+#endif
+#ifdef BKMOD_CONTAINER
+    #include <bakatools/container/data_stream.h>
+    #include <bakatools/container/trie.h>
+#endif
+#ifdef BKMOD_THREAD
     #include <bakatools/thread/task_timer.h>
+    #include <bakatools/thread/task_delayer.h>
+    #define BKMOD_TIME
 #endif
-#ifdef BKM_FILESYSTEM
+#ifdef BKMOD_FILESYSTEM
+    #include <bakatools/file_system/dir_entry.h> 
+    #include <bakatools/file_system/directory.h>
+    #include <bakatools/file_system/file.h>
     #include <bakatools/file_system/file_watcher.h>
+    #define BKMOD_TIME
 #endif
-#ifdef BKM_DATASTRUCT
+#ifdef BKMOD_TIME
-    #include <bakatools/data_struct/trie.h>
+    #include <bakatools/time/time.h>
 #endif