diff --git a/ZRColaWS/appcomponent.h b/ZRColaWS/appcomponent.h
deleted file mode 100644
index ab06483..0000000
--- a/ZRColaWS/appcomponent.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-    SPDX-License-Identifier: GPL-3.0-or-later
-    Copyright © 2022 Amebis
-*/
-
-#pragma once
-
-#include <oatpp/core/macro/component.hpp>
-#include <oatpp/network/tcp/server/ConnectionProvider.hpp>
-#include <oatpp/parser/json/mapping/ObjectMapper.hpp>
-#include <oatpp/web/server/HttpConnectionHandler.hpp>
-
-class AppComponent
-{
-public:
-  OATPP_CREATE_COMPONENT(std::shared_ptr<oatpp::network::ServerConnectionProvider>, serverConnectionProvider)([] {
-    return oatpp::network::tcp::server::ConnectionProvider::createShared({"localhost", 8000, oatpp::network::Address::IP_4});
-  }());
-
-  OATPP_CREATE_COMPONENT(std::shared_ptr<oatpp::web::server::HttpRouter>, httpRouter)([] {
-    return oatpp::web::server::HttpRouter::createShared();
-  }());
-
-  OATPP_CREATE_COMPONENT(std::shared_ptr<oatpp::network::ConnectionHandler>, serverConnectionHandler)([] {
-    OATPP_COMPONENT(std::shared_ptr<oatpp::web::server::HttpRouter>, router);
-    return oatpp::web::server::HttpConnectionHandler::createShared(router);
-  }());
-
-  OATPP_CREATE_COMPONENT(std::shared_ptr<oatpp::data::mapping::ObjectMapper>, apiObjectMapper)([] {
-    return oatpp::parser::json::mapping::ObjectMapper::createShared();
-  }());
-};
diff --git a/ZRColaWS/appcomponent.hpp b/ZRColaWS/appcomponent.hpp
new file mode 100644
index 0000000..4cb746a
--- /dev/null
+++ b/ZRColaWS/appcomponent.hpp
@@ -0,0 +1,32 @@
+/*
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2022 Amebis
+*/
+
+#pragma once
+
+#include <oatpp/core/macro/component.hpp>
+#include <oatpp/network/tcp/server/ConnectionProvider.hpp>
+#include <oatpp/parser/json/mapping/ObjectMapper.hpp>
+#include <oatpp/web/server/HttpConnectionHandler.hpp>
+
+class AppComponent
+{
+public:
+    OATPP_CREATE_COMPONENT(std::shared_ptr<oatpp::network::ServerConnectionProvider>, serverConnectionProvider)([] {
+        return oatpp::network::tcp::server::ConnectionProvider::createShared({"localhost", 8000, oatpp::network::Address::IP_4});
+    }());
+
+    OATPP_CREATE_COMPONENT(std::shared_ptr<oatpp::web::server::HttpRouter>, httpRouter)([] {
+        return oatpp::web::server::HttpRouter::createShared();
+    }());
+
+    OATPP_CREATE_COMPONENT(std::shared_ptr<oatpp::network::ConnectionHandler>, serverConnectionHandler)([] {
+        OATPP_COMPONENT(std::shared_ptr<oatpp::web::server::HttpRouter>, router);
+        return oatpp::web::server::HttpConnectionHandler::createShared(router);
+    }());
+
+    OATPP_CREATE_COMPONENT(std::shared_ptr<oatpp::data::mapping::ObjectMapper>, apiObjectMapper)([] {
+        return oatpp::parser::json::mapping::ObjectMapper::createShared();
+    }());
+};
diff --git a/ZRColaWS/controller.h b/ZRColaWS/controller.hpp
similarity index 96%
rename from ZRColaWS/controller.h
rename to ZRColaWS/controller.hpp
index a2ade0f..293b99d 100644
--- a/ZRColaWS/controller.h
+++ b/ZRColaWS/controller.hpp
@@ -5,9 +5,9 @@
 
 #pragma once
 
-#include "dto.h"
-#include "iconverter.h"
-#include "zrcolaws.h"
+#include "dto.hpp"
+#include "iconverter.hpp"
+#include "zrcolaws.hpp"
 #include <zrcola/translate.h>
 #include <oatpp/core/macro/codegen.hpp>
 #include <oatpp/core/macro/component.hpp>
@@ -89,8 +89,6 @@ public:
                 }
             }
 
-            // TODO: Flatten mapping and return along with the translated text.
-
             utf16toutf8 cOut;
             auto dto = translateOutDto::createShared();
             dto->text = cOut.convert(dst);
diff --git a/ZRColaWS/dto.h b/ZRColaWS/dto.hpp
similarity index 100%
rename from ZRColaWS/dto.h
rename to ZRColaWS/dto.hpp
diff --git a/ZRColaWS/iconverter.h b/ZRColaWS/iconverter.hpp
similarity index 100%
rename from ZRColaWS/iconverter.h
rename to ZRColaWS/iconverter.hpp
diff --git a/ZRColaWS/zrcolaws.cpp b/ZRColaWS/zrcolaws.cpp
index 350e398..39b5e52 100644
--- a/ZRColaWS/zrcolaws.cpp
+++ b/ZRColaWS/zrcolaws.cpp
@@ -3,9 +3,9 @@
     Copyright © 2022 Amebis
 */
 
-#include "appcomponent.h"
-#include "controller.h"
-#include "zrcolaws.h"
+#include "appcomponent.hpp"
+#include "controller.hpp"
+#include "zrcolaws.hpp"
 #include <oatpp/network/Server.hpp>
 #include <fstream>
 
diff --git a/ZRColaWS/zrcolaws.h b/ZRColaWS/zrcolaws.hpp
similarity index 100%
rename from ZRColaWS/zrcolaws.h
rename to ZRColaWS/zrcolaws.hpp