diff --git a/src/config.cpp b/src/config/config.cpp
similarity index 100%
rename from src/config.cpp
rename to src/config/config.cpp
diff --git a/src/config.hpp b/src/config/config.hpp
similarity index 100%
rename from src/config.hpp
rename to src/config/config.hpp
diff --git a/src/formatter.cpp b/src/format/format.cpp
similarity index 100%
rename from src/formatter.cpp
rename to src/format/format.cpp
diff --git a/src/formatter.hpp b/src/format/format.hpp
similarity index 100%
rename from src/formatter.hpp
rename to src/format/format.hpp
diff --git a/src/markdown.cpp b/src/markdown/markdown.cpp
similarity index 100%
rename from src/markdown.cpp
rename to src/markdown/markdown.cpp
diff --git a/src/markdown.hpp b/src/markdown/markdown.hpp
similarity index 100%
rename from src/markdown.hpp
rename to src/markdown/markdown.hpp
diff --git a/src/tests/tests.cpp b/src/tests.cpp
similarity index 100%
rename from src/tests/tests.cpp
rename to src/tests.cpp
diff --git a/src/utils.cpp b/src/utils.cpp
deleted file mode 100644
index d685c7b..0000000
--- a/src/utils.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <set>
-#include <sstream>
-#include <string>
-
-void trim(std::string &str) {
-  str.erase(str.find_last_not_of(' ') + 1);
-  str.erase(0, str.find_first_not_of(' '));
-  str.erase(str.find_last_not_of('"') + 1);
-  str.erase(0, str.find_first_not_of('"'));
-}
diff --git a/src/utils.hpp b/src/utils.hpp
deleted file mode 100644
index d005eb6..0000000
--- a/src/utils.hpp
+++ /dev/null
@@ -1,4 +0,0 @@
-#include <string>
-
-// trim string in-place, removing all whitespaces and surrounding '"' symbols
-void trim(std::string &str);