Index: .gitignore
===================================================================
--- .gitignore	(revision 4eb4d0a332ded1fe7cb82507024c5363538786eb)
+++ .gitignore	(revision 99d44b2ebfe7a6be9df4ff5e0e81f792cc0f151a)
@@ -1,5 +1,5 @@
-spacegame
 newgame
 vulkanref
+vulkangame
 
 gl.log
Index: main-vulkan.cpp
===================================================================
--- main-vulkan.cpp	(revision 99d44b2ebfe7a6be9df4ff5e0e81f792cc0f151a)
+++ main-vulkan.cpp	(revision 99d44b2ebfe7a6be9df4ff5e0e81f792cc0f151a)
@@ -0,0 +1,29 @@
+#include "vulkan-game.hpp"
+
+#include <iostream>
+
+using namespace std;
+
+int main(int argc, char* argv[]) {
+
+#ifdef NDEBUG
+   cout << "DEBUGGING IS OFF" << endl;
+#else
+   cout << "DEBUGGING IS ON" << endl;
+#endif
+
+   cout << "Starting Vulkan Game..." << endl;
+
+   VulkanGame game;
+
+   try {
+      game.run();
+   } catch (const exception& e) {
+      cerr << e.what() << endl;
+      return EXIT_FAILURE;
+   }
+
+   cout << "Finished running the game" << endl;
+
+   return EXIT_SUCCESS;
+}
Index: in.cpp
===================================================================
--- main.cpp	(revision 4eb4d0a332ded1fe7cb82507024c5363538786eb)
+++ 	(revision )
@@ -1,29 +1,0 @@
-#include "space-game.hpp"
-
-#include <iostream>
-
-using namespace std;
-
-int main(int argc, char* argv[]) {
-
-#ifdef NDEBUG
-   cout << "DEBUGGING IS OFF" << endl;
-#else
-   cout << "DEBUGGING IS ON" << endl;
-#endif
-
-   cout << "Starting Space Game..." << endl;
-
-   SpaceGame game;
-
-   try {
-      game.run();
-   } catch (const exception& e) {
-      cerr << e.what() << endl;
-      return EXIT_FAILURE;
-   }
-
-   cout << "Finished running the game" << endl;
-
-   return EXIT_SUCCESS;
-}
Index: makefile
===================================================================
--- makefile	(revision 4eb4d0a332ded1fe7cb82507024c5363538786eb)
+++ makefile	(revision 99d44b2ebfe7a6be9df4ff5e0e81f792cc0f151a)
@@ -56,5 +56,5 @@
 	$(CC) $(CXX_FLAGS) -o $@ $^ $(LIB_FLAGS) -DGAMEGUI_INCLUDE_VULKAN
 
-spacegame: main.cpp space-game.cpp game-gui-sdl.cpp
+vulkangame: main-vulkan.cpp vulkan-game.cpp game-gui-sdl.cpp
 	$(CC) $(CXX_FLAGS) -o $@ $^ $(LIB_FLAGS)
 
@@ -66,4 +66,4 @@
 	rm -f newgame
 	rm -f vulkanref
-	rm -f spacegame
+	rm -f vulkangame
 	rm -f shaders/*.spv
Index: ace-game.cpp
===================================================================
--- space-game.cpp	(revision 4eb4d0a332ded1fe7cb82507024c5363538786eb)
+++ 	(revision )
@@ -1,71 +1,0 @@
-#include "space-game.hpp"
-
-#include <iostream>
-
-#include "game-gui-sdl.hpp"
-
-using namespace std;
-
-SpaceGame::SpaceGame() {
-   gui = nullptr;
-   window = nullptr;
-}
-
-SpaceGame::~SpaceGame() {
-}
-
-void SpaceGame::run() {
-   if (initWindow() == RTWO_ERROR) {
-      return;
-   }
-   initVulkan();
-   mainLoop();
-   cleanup();
-}
-
-bool SpaceGame::initWindow() {
-   gui = new GameGui_SDL();
-
-   if (gui->Init() == RTWO_ERROR) {
-      cout << "UI library could not be initialized!" << endl;
-      cout << SDL_GetError() << endl;
-      return RTWO_ERROR;
-   }
-   cout << "GUI init succeeded" << endl;
-
-   window = (SDL_Window*) gui->CreateWindow("Vulkan Game", SCREEN_WIDTH, SCREEN_HEIGHT);
-   if (window == nullptr) {
-      cout << "Window could not be created!" << endl;
-      return RTWO_ERROR;
-   }
-
-   return RTWO_SUCCESS;
-}
-
-void SpaceGame::initVulkan() {
-}
-
-void SpaceGame::mainLoop() {
-   SDL_Event e;
-   bool quit = false;
-
-   while (!quit) {
-      while (SDL_PollEvent(&e)) {
-         if (e.type == SDL_QUIT) {
-            quit = true;
-         }
-         if (e.type == SDL_KEYDOWN) {
-            quit = true;
-         }
-         if (e.type == SDL_MOUSEBUTTONDOWN) {
-            quit = true;
-         }
-      }
-   }
-}
-
-void SpaceGame::cleanup() {
-   gui->DestroyWindow();
-   gui->Shutdown();
-   delete gui;
-}
Index: ace-game.hpp
===================================================================
--- space-game.hpp	(revision 4eb4d0a332ded1fe7cb82507024c5363538786eb)
+++ 	(revision )
@@ -1,26 +1,0 @@
-#ifndef _SPACE_GAME_H
-#define _SPACE_GAME_H
-
-#include "game-gui-sdl.hpp"
-
-const int SCREEN_WIDTH = 800;
-const int SCREEN_HEIGHT = 600;
-
-class SpaceGame {
-   public:
-      SpaceGame();
-      ~SpaceGame();
-
-      void run();
-
-   private:
-      GameGui* gui;
-      SDL_Window* window;
-
-      bool initWindow();
-      void initVulkan();
-      void mainLoop();
-      void cleanup();
-};
-
-#endif // _SPACE_GAME_H
Index: vulkan-game.cpp
===================================================================
--- vulkan-game.cpp	(revision 99d44b2ebfe7a6be9df4ff5e0e81f792cc0f151a)
+++ vulkan-game.cpp	(revision 99d44b2ebfe7a6be9df4ff5e0e81f792cc0f151a)
@@ -0,0 +1,72 @@
+#include "vulkan-game.hpp"
+
+#include <iostream>
+
+#define GAMEGUI_INCLUDE_VULKAN
+#include "game-gui-sdl.hpp"
+
+using namespace std;
+
+VulkanGame::VulkanGame() {
+   gui = nullptr;
+   window = nullptr;
+}
+
+VulkanGame::~VulkanGame() {
+}
+
+void VulkanGame::run() {
+   if (initWindow() == RTWO_ERROR) {
+      return;
+   }
+   initVulkan();
+   mainLoop();
+   cleanup();
+}
+
+bool VulkanGame::initWindow() {
+   gui = new GameGui_SDL();
+
+   if (gui->Init() == RTWO_ERROR) {
+      cout << "UI library could not be initialized!" << endl;
+      cout << SDL_GetError() << endl;
+      return RTWO_ERROR;
+   }
+   cout << "GUI init succeeded" << endl;
+
+   window = (SDL_Window*) gui->CreateWindow("Vulkan Game", SCREEN_WIDTH, SCREEN_HEIGHT);
+   if (window == nullptr) {
+      cout << "Window could not be created!" << endl;
+      return RTWO_ERROR;
+   }
+
+   return RTWO_SUCCESS;
+}
+
+void VulkanGame::initVulkan() {
+}
+
+void VulkanGame::mainLoop() {
+   SDL_Event e;
+   bool quit = false;
+
+   while (!quit) {
+      while (SDL_PollEvent(&e)) {
+         if (e.type == SDL_QUIT) {
+            quit = true;
+         }
+         if (e.type == SDL_KEYDOWN) {
+            quit = true;
+         }
+         if (e.type == SDL_MOUSEBUTTONDOWN) {
+            quit = true;
+         }
+      }
+   }
+}
+
+void VulkanGame::cleanup() {
+   gui->DestroyWindow();
+   gui->Shutdown();
+   delete gui;
+}
Index: vulkan-game.hpp
===================================================================
--- vulkan-game.hpp	(revision 99d44b2ebfe7a6be9df4ff5e0e81f792cc0f151a)
+++ vulkan-game.hpp	(revision 99d44b2ebfe7a6be9df4ff5e0e81f792cc0f151a)
@@ -0,0 +1,26 @@
+#ifndef _VULKAN_GAME_H
+#define _VULKAN_GAME_H
+
+#include "game-gui-sdl.hpp"
+
+const int SCREEN_WIDTH = 800;
+const int SCREEN_HEIGHT = 600;
+
+class VulkanGame {
+   public:
+      VulkanGame();
+      ~VulkanGame();
+
+      void run();
+
+   private:
+      GameGui* gui;
+      SDL_Window* window;
+
+      bool initWindow();
+      void initVulkan();
+      void mainLoop();
+      void cleanup();
+};
+
+#endif // _VULKAN_GAME_H