diff --git a/CMakeLists.txt b/CMakeLists.txt
index a35f54d..735f2b8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,26 +2,26 @@ cmake_minimum_required(VERSION 3.9 FATAL_ERROR)
 
 project(solanaceae)
 
-add_library(solanaceae_core
-	./solanaceae/core/utils.hpp
-	./solanaceae/core/utils.cpp
+add_library(solanaceae_toxcore
+	./solanaceae/toxcore/utils.hpp
+	./solanaceae/toxcore/utils.cpp
 
-	./solanaceae/core/tox_interface.hpp
-	./solanaceae/core/tox_interface.cpp
-	./solanaceae/core/tox_event_interface.hpp
+	./solanaceae/toxcore/tox_interface.hpp
+	./solanaceae/toxcore/tox_interface.cpp
+	./solanaceae/toxcore/tox_event_interface.hpp
 
-	./solanaceae/core/tox_default_impl.hpp
-	./solanaceae/core/tox_default_impl.cpp
-	./solanaceae/core/tox_event_provider_base.hpp
-	./solanaceae/core/tox_event_provider_base.cpp
+	./solanaceae/toxcore/tox_default_impl.hpp
+	./solanaceae/toxcore/tox_default_impl.cpp
+	./solanaceae/toxcore/tox_event_provider_base.hpp
+	./solanaceae/toxcore/tox_event_provider_base.cpp
 
-	./solanaceae/core/tox_event_logger.hpp
-	./solanaceae/core/tox_event_logger.cpp
+	./solanaceae/toxcore/tox_event_logger.hpp
+	./solanaceae/toxcore/tox_event_logger.cpp
 )
 
-target_include_directories(solanaceae_core PUBLIC .)
-target_compile_features(solanaceae_core PUBLIC cxx_std_17)
-target_link_libraries(solanaceae_core PUBLIC
+target_include_directories(solanaceae_toxcore PUBLIC .)
+target_compile_features(solanaceae_toxcore PUBLIC cxx_std_17)
+target_link_libraries(solanaceae_toxcore PUBLIC
 	toxcore
 )
 
diff --git a/solanaceae/core/tox_default_impl.cpp b/solanaceae/toxcore/tox_default_impl.cpp
similarity index 100%
rename from solanaceae/core/tox_default_impl.cpp
rename to solanaceae/toxcore/tox_default_impl.cpp
diff --git a/solanaceae/core/tox_default_impl.hpp b/solanaceae/toxcore/tox_default_impl.hpp
similarity index 100%
rename from solanaceae/core/tox_default_impl.hpp
rename to solanaceae/toxcore/tox_default_impl.hpp
diff --git a/solanaceae/core/tox_event_interface.hpp b/solanaceae/toxcore/tox_event_interface.hpp
similarity index 100%
rename from solanaceae/core/tox_event_interface.hpp
rename to solanaceae/toxcore/tox_event_interface.hpp
diff --git a/solanaceae/core/tox_event_logger.cpp b/solanaceae/toxcore/tox_event_logger.cpp
similarity index 100%
rename from solanaceae/core/tox_event_logger.cpp
rename to solanaceae/toxcore/tox_event_logger.cpp
diff --git a/solanaceae/core/tox_event_logger.hpp b/solanaceae/toxcore/tox_event_logger.hpp
similarity index 100%
rename from solanaceae/core/tox_event_logger.hpp
rename to solanaceae/toxcore/tox_event_logger.hpp
diff --git a/solanaceae/core/tox_event_provider_base.cpp b/solanaceae/toxcore/tox_event_provider_base.cpp
similarity index 100%
rename from solanaceae/core/tox_event_provider_base.cpp
rename to solanaceae/toxcore/tox_event_provider_base.cpp
diff --git a/solanaceae/core/tox_event_provider_base.hpp b/solanaceae/toxcore/tox_event_provider_base.hpp
similarity index 100%
rename from solanaceae/core/tox_event_provider_base.hpp
rename to solanaceae/toxcore/tox_event_provider_base.hpp
diff --git a/solanaceae/core/tox_interface.cpp b/solanaceae/toxcore/tox_interface.cpp
similarity index 100%
rename from solanaceae/core/tox_interface.cpp
rename to solanaceae/toxcore/tox_interface.cpp
diff --git a/solanaceae/core/tox_interface.hpp b/solanaceae/toxcore/tox_interface.hpp
similarity index 100%
rename from solanaceae/core/tox_interface.hpp
rename to solanaceae/toxcore/tox_interface.hpp
diff --git a/solanaceae/core/utils.cpp b/solanaceae/toxcore/utils.cpp
similarity index 100%
rename from solanaceae/core/utils.cpp
rename to solanaceae/toxcore/utils.cpp
diff --git a/solanaceae/core/utils.hpp b/solanaceae/toxcore/utils.hpp
similarity index 100%
rename from solanaceae/core/utils.hpp
rename to solanaceae/toxcore/utils.hpp