diff --git a/CMakeLists.txt b/CMakeLists.txt
index deb9daf..4362251 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -90,6 +90,7 @@ endif()
 
 # Find packages go here.
 find_package(PkgConfig REQUIRED)
+find_package(PostgreSQL REQUIRED)
 
 pkg_check_modules(GTK4 REQUIRED gtk4>=4.0)
 message("GTK4 include dir: ${GTK4_INCLUDE_DIRS}")
@@ -108,15 +109,16 @@ message("ADW Other CFlags: ${ADW_CFLAGS_OTHER}")
 
 # Setup CMake to use GTK+, tell the compiler where to look for headers
 # and to the linker where to look for libraries
-include_directories(${GTK4_INCLUDE_DIRS} ${ADW_INCLUDE_DIRS})
+include_directories(${GTK4_INCLUDE_DIRS} ${ADW_INCLUDE_DIRS} ${PostgreSQL_INCLUDE_DIRS} ${PostgreSQL_SERVER_INCLUDE_DIRS})
 link_directories(${GTK4_LIBRARY_DIRS} ${ADW_LIBRARY_DIRS})
 add_definitions(${GTK4_CFLAGS_OTHER} ${ADW_CFLAGS_OTHER})
 
 # Adding something we can run - Output name matches target name
 add_executable(DrogonCMS src/base.c)
+#add_executable(PG_Store vendors/postgresql-db/main.cc)
 
 # Include drogon source code locally
-add_subdirectory(vendors/local-api-server/)
+add_subdirectory(vendors/api-server/)
 add_subdirectory(vendors/simple-reverse-proxy/)
 
 # This is a "default" library, and will match the *** variable setting.
@@ -129,7 +131,7 @@ add_subdirectory(vendors/simple-reverse-proxy/)
 # Make sure you link your targets with this command. It can also link libraries and
 # even flags, so linking a target that does not exist will not give a configure-time error.
 target_include_directories(${PROJECT_NAME} PUBLIC ${GTK4_LIBRARIES} ${ADW_LIBRARIES})
-target_link_libraries(${PROJECT_NAME} PRIVATE ${GTK4_LIBRARIES} ${ADW_LIBRARIES} drogon)
+target_link_libraries(${PROJECT_NAME} PRIVATE ${GTK4_LIBRARIES} ${ADW_LIBRARIES} PostgreSQL::PostgreSQL)
 
 # Target Compile Options
 target_compile_options(${PROJECT_NAME} PRIVATE ${WARNING_LEVELS_GCC} $<$<CONFIG:DEBUG>:${WARNING_LEVELS_GCC_DEBUG}>)
diff --git a/README.md b/README.md
index 34548f0..7b2978c 100644
--- a/README.md
+++ b/README.md
@@ -122,7 +122,7 @@ An optional recommendation is Geany IDE.
 | Configure   | cmake -D CMAKE_BUILD_TYPE=Release  | /home/username/Desktop/Local-Development/cplusplus/DrogonCMS/ |
 | Build	      | cmake --build .    | /home/username/Desktop/Local-Development/cplusplus/DrogonCMS         |
 | Run GUI     | ./DrogonCMS        | /home/username/Desktop/Local-Development/cplusplus/DrogonCMS/        |
-| Run API     | ./local-drogon-server-api    | /home/username/Desktop/Local-Development/cplusplus/DrogonCMS/vendors/drogon/local-api-server/         |
+| Run API     | ./DrogonCMS-API-Server    | /home/username/Desktop/Local-Development/cplusplus/DrogonCMS/vendors/api-server/         |
 | Install     | cmake --install    | /home/username/Desktop/Local-Development/cplusplus/DrogonCMS/         |
 
 ## Authors
diff --git a/vendors/local-api-server/.gitignore b/vendors/api-server/.gitignore
similarity index 100%
rename from vendors/local-api-server/.gitignore
rename to vendors/api-server/.gitignore
diff --git a/vendors/local-api-server/CMakeLists.txt b/vendors/api-server/CMakeLists.txt
similarity index 98%
rename from vendors/local-api-server/CMakeLists.txt
rename to vendors/api-server/CMakeLists.txt
index 17e5a73..e4c5754 100644
--- a/vendors/local-api-server/CMakeLists.txt
+++ b/vendors/api-server/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Note: drogon_ctl was implemented to create the local template architecture
 
 cmake_minimum_required(VERSION 3.5)
-project(local-drogon-api-server CXX)
+project(DrogonCMS-API-Server CXX)
 
 include(CheckIncludeFileCXX)
 
diff --git a/vendors/api-server/DrogonCMS-API-Server b/vendors/api-server/DrogonCMS-API-Server
new file mode 100755
index 0000000..b9c37a0
Binary files /dev/null and b/vendors/api-server/DrogonCMS-API-Server differ
diff --git a/vendors/local-api-server/README.md b/vendors/api-server/README.md
similarity index 100%
rename from vendors/local-api-server/README.md
rename to vendors/api-server/README.md
diff --git a/vendors/local-api-server/config.yaml b/vendors/api-server/config.yaml
similarity index 100%
rename from vendors/local-api-server/config.yaml
rename to vendors/api-server/config.yaml
diff --git a/vendors/local-api-server/controllers/README.md b/vendors/api-server/controllers/README.md
similarity index 100%
rename from vendors/local-api-server/controllers/README.md
rename to vendors/api-server/controllers/README.md
diff --git a/vendors/local-api-server/example-config.json b/vendors/api-server/example-config.json
similarity index 100%
rename from vendors/local-api-server/example-config.json
rename to vendors/api-server/example-config.json
diff --git a/vendors/local-api-server/filters/README.md b/vendors/api-server/filters/README.md
similarity index 100%
rename from vendors/local-api-server/filters/README.md
rename to vendors/api-server/filters/README.md
diff --git a/vendors/local-api-server/index.html b/vendors/api-server/index.html
similarity index 100%
rename from vendors/local-api-server/index.html
rename to vendors/api-server/index.html
diff --git a/vendors/local-api-server/main.cc b/vendors/api-server/main.cc
similarity index 100%
rename from vendors/local-api-server/main.cc
rename to vendors/api-server/main.cc
diff --git a/vendors/local-api-server/models/model.json b/vendors/api-server/models/model.json
similarity index 100%
rename from vendors/local-api-server/models/model.json
rename to vendors/api-server/models/model.json
diff --git a/vendors/local-api-server/plugins/README.md b/vendors/api-server/plugins/README.md
similarity index 100%
rename from vendors/local-api-server/plugins/README.md
rename to vendors/api-server/plugins/README.md
diff --git a/vendors/local-api-server/test/CMakeLists.txt b/vendors/api-server/test/CMakeLists.txt
similarity index 100%
rename from vendors/local-api-server/test/CMakeLists.txt
rename to vendors/api-server/test/CMakeLists.txt
diff --git a/vendors/api-server/test/local-server_test b/vendors/api-server/test/local-server_test
new file mode 100755
index 0000000..9aca2c0
Binary files /dev/null and b/vendors/api-server/test/local-server_test differ
diff --git a/vendors/local-api-server/test/test_main.cc b/vendors/api-server/test/test_main.cc
similarity index 100%
rename from vendors/local-api-server/test/test_main.cc
rename to vendors/api-server/test/test_main.cc
diff --git a/vendors/local-api-server/views/README.md b/vendors/api-server/views/README.md
similarity index 100%
rename from vendors/local-api-server/views/README.md
rename to vendors/api-server/views/README.md