diff --git a/README.md b/README.md
index ba9fde6..0bb0acb 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-I'm messing around with GLFW to build an OpenGL app in wayland, theoretically this is the starting point for a game engine.
+# Wayland Application
 
 ### Setup
 
diff --git a/libs/ecs/component.hpp b/libs/ecs/component.hpp
deleted file mode 100644
index 323866e..0000000
--- a/libs/ecs/component.hpp
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef COMPONENT_HPP
-#define COMPONENT_HPP
-
-#include <bitset>
-#include <cstdint>
-
-using ComponentType = std::uint8_t;
-
-const ComponentType MAX_COMPONENTS = 32;
-
-using Signature = std::bitset<MAX_COMPONENTS>;
-
-#endif // COMPONENT_HPP
diff --git a/libs/ecs/componentmanager.cpp b/libs/ecs/componentmanager.cpp
deleted file mode 100644
index 352c01f..0000000
--- a/libs/ecs/componentmanager.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-#include "componentmanager.hpp"
-
-#include <cassert>
-#include <memory>
-
-/**
- * ComponentArray
- **/
-
-template <typename T>
-void ComponentArray<T>::InsertData(Entity entity, T component) {
-  assert(mEntityToIndexMap.find(entity) == mEntityToIndexMap.end() &&
-         "Component added to same entity more than once.");
-
-  // Put new entry at end and update the maps
-  size_t newIndex = mSize;
-  mEntityToIndexMap[entity] = newIndex;
-  mIndexToEntityMap[newIndex] = entity;
-  mComponentArray[newIndex] = component;
-  ++mSize;
-};
-template <typename T> void ComponentArray<T>::RemoveData(Entity entity) {
-  assert(mEntityToIndexMap.find(entity) != mEntityToIndexMap.end() &&
-         "Removing non-existent component.");
-
-  // Copy element at end into deleted element's place to maintain density
-  size_t indexOfRemovedEntity = mEntityToIndexMap[entity];
-  size_t indexOfLastElement = mSize - 1;
-  mComponentArray[indexOfRemovedEntity] = mComponentArray[indexOfLastElement];
-
-  // Update map to point to moved spot
-  Entity entityOfLastElement = mIndexToEntityMap[indexOfLastElement];
-  mEntityToIndexMap[entityOfLastElement] = indexOfRemovedEntity;
-  mIndexToEntityMap[indexOfRemovedEntity] = entityOfLastElement;
-
-  mEntityToIndexMap.erase(entity);
-  mIndexToEntityMap.erase(indexOfLastElement);
-
-  --mSize;
-};
-template <typename T> T &ComponentArray<T>::GetData(Entity entity) {
-  assert(mEntityToIndexMap.find(entity) != mEntityToIndexMap.end() &&
-         "Retrieving non-existent component.");
-
-  // Return a reference to the entity's component
-  return mComponentArray[mEntityToIndexMap[entity]];
-};
-template <typename T> void ComponentArray<T>::EntityDestroyed(Entity entity) {
-  if (mEntityToIndexMap.find(entity) != mEntityToIndexMap.end()) {
-    // Remove the entity's component if it existed
-    RemoveData(entity);
-  }
-};
-
-/**
- * ComponentManager
- **/
-
-//  Private functions
-template <typename T>
-std::shared_ptr<ComponentArray<T>> ComponentManager::GetComponentArray() {
-  const char *typeName = typeid(T).name();
-
-  assert(mComponentTypes.find(typeName) != mComponentTypes.end() &&
-         "Component not registered before use.");
-
-  return std::static_pointer_cast<ComponentArray<T>>(
-      mComponentArrays[typeName]);
-}
-
-//  Public functions
-template <typename T> void ComponentManager::RegisterComponent() {
-  const char *typeName = typeid(T).name();
-
-  assert(mComponentTypes.find(typeName) == mComponentTypes.end() &&
-         "Registering component type more than once.");
-
-  // Add this component type to the component type map
-  mComponentTypes.insert({typeName, mNextComponentType});
-
-  // Create a ComponentArray pointer and add it to the component arrays map
-  mComponentArrays.insert({typeName, std::make_shared<ComponentArray<T>>()});
-
-  // Increment the value so that the next component registered will be different
-  ++mNextComponentType;
-};
-template <typename T> ComponentType ComponentManager::GetComponentType() {
-  const char *typeName = typeid(T).name();
-
-  assert(mComponentTypes.find(typeName) != mComponentTypes.end() &&
-         "Component not registered before use.");
-
-  // Return this component's type - used for creating signatures
-  return mComponentTypes[typeName];
-}
-template <typename T>
-void ComponentManager::AddComponent(Entity entity, T component) {
-  // Add a component to the array for an entity
-  GetComponentArray<T>()->InsertData(entity, component);
-}
-template <typename T> void ComponentManager::RemoveComponent(Entity entity) {
-  // Remove a component from the array for an entity
-  GetComponentArray<T>()->RemoveData(entity);
-}
-template <typename T> T &ComponentManager::GetComponent(Entity entity) {
-  // Get a reference to a component from the array for an entity
-  return GetComponentArray<T>()->GetData(entity);
-}
-void ComponentManager::EntityDestroyed(Entity entity) {
-  // Notify each component array that an entity has been destroyed
-  // If it has a component for that entity, it will remove it
-  for (auto const &pair : mComponentArrays) {
-    auto const &component = pair.second;
-
-    component->EntityDestroyed(entity);
-  }
-};
diff --git a/libs/ecs/componentmanager.hpp b/libs/ecs/componentmanager.hpp
deleted file mode 100644
index a11f17e..0000000
--- a/libs/ecs/componentmanager.hpp
+++ /dev/null
@@ -1,63 +0,0 @@
-#ifndef COMPONENTMANAGER_HPP
-#define COMPONENTMANAGER_HPP
-
-#include <array>
-#include <unordered_map>
-#include <memory>
-#include "entity.hpp"
-
-class IComponentArray {
-public:
-  virtual ~IComponentArray() = default;
-  virtual void EntityDestroyed(Entity entity) = 0;
-};
-
-template <typename T> class ComponentArray : public IComponentArray {
-  // The packed array of components (of generic type T),
-  // set to a specified maximum amount, matching the maximum number
-  // of entities allowed to exist simultaneously, so that each entity
-  // has a unique spot.
-  std::array<T, MAX_ENTITIES> mComponentArray;
-
-  // Map from an entity ID to an array index.
-  std::unordered_map<Entity, size_t> mEntityToIndexMap;
-
-  // Map from an array index to an entity ID.
-  std::unordered_map<size_t, Entity> mIndexToEntityMap;
-
-  // Total size of valid entries in the array.
-  size_t mSize;
-
-public:
-  void InsertData(Entity entity, T component);
-  void RemoveData(Entity entity);
-  T &GetData(Entity entity);
-  void EntityDestroyed(Entity entity) override;
-};
-
-class ComponentManager {
-  // Map from type string pointer to a component type
-  std::unordered_map<const char *, ComponentType> mComponentTypes{};
-
-  // Map from type string pointer to a component array
-  std::unordered_map<const char *, std::shared_ptr<IComponentArray>>
-      mComponentArrays{};
-
-  // The component type to be assigned to the next registered component -
-  // starting at 0
-  ComponentType mNextComponentType{};
-
-  // Convenience function to get the statically casted pointer to the
-  // ComponentArray of type T.
-  template <typename T> std::shared_ptr<ComponentArray<T>> GetComponentArray();
-
-public:
-  template <typename T> void RegisterComponent();
-  template <typename T> ComponentType GetComponentType();
-  template <typename T> void AddComponent(Entity entity, T component);
-  template <typename T> void RemoveComponent(Entity entity);
-  template <typename T> T &GetComponent(Entity entity);
-  void EntityDestroyed(Entity entity);
-};
-
-#endif // COMPONENTMANAGER_HPP
diff --git a/libs/ecs/coordinator.cpp b/libs/ecs/coordinator.cpp
deleted file mode 100644
index af6f545..0000000
--- a/libs/ecs/coordinator.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-#include "coordinator.hpp"
-
-void Coordinator::Init() {
-  // Create pointers to each manager
-  mComponentManager = std::make_unique<ComponentManager>();
-  mEntityManager = std::make_unique<EntityManager>();
-  mSystemManager = std::make_unique<SystemManager>();
-}
-
-// Entity methods
-Entity Coordinator::CreateEntity() { return mEntityManager->CreateEntity(); }
-
-void Coordinator::DestroyEntity(Entity entity) {
-  mEntityManager->DestroyEntity(entity);
-
-  mComponentManager->EntityDestroyed(entity);
-
-  mSystemManager->EntityDestroyed(entity);
-}
-
-// Component methods
-template <typename T> void Coordinator::RegisterComponent() {
-  mComponentManager->RegisterComponent<T>();
-}
-
-template <typename T>
-void Coordinator::AddComponent(Entity entity, T component) {
-  mComponentManager->AddComponent<T>(entity, component);
-
-  auto signature = mEntityManager->GetSignature(entity);
-  signature.set(mComponentManager->GetComponentType<T>(), true);
-  mEntityManager->SetSignature(entity, signature);
-
-  mSystemManager->EntitySignatureChanged(entity, signature);
-}
-
-template <typename T> void Coordinator::RemoveComponent(Entity entity) {
-  mComponentManager->RemoveComponent<T>(entity);
-
-  auto signature = mEntityManager->GetSignature(entity);
-  signature.set(mComponentManager->GetComponentType<T>(), false);
-  mEntityManager->SetSignature(entity, signature);
-
-  mSystemManager->EntitySignatureChanged(entity, signature);
-}
-
-template <typename T> T &Coordinator::GetComponent(Entity entity) {
-  return mComponentManager->GetComponent<T>(entity);
-}
-
-template <typename T> ComponentType Coordinator::GetComponentType() {
-  return mComponentManager->GetComponentType<T>();
-}
-
-// System methods
-template <typename T> std::shared_ptr<T> Coordinator::RegisterSystem() {
-  return mSystemManager->RegisterSystem<T>();
-}
-
-template <typename T>
-void Coordinator::SetSystemSignature(Signature signature) {
-  mSystemManager->SetSignature<T>(signature);
-}
diff --git a/libs/ecs/coordinator.hpp b/libs/ecs/coordinator.hpp
deleted file mode 100644
index 73f5a36..0000000
--- a/libs/ecs/coordinator.hpp
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef COORDINATOR_HPP
-#define COORDINATOR_HPP
-
-#include <memory>
-#include "componentmanager.hpp"
-#include "entity.hpp"
-#include "system.hpp"
-
-class Coordinator {
-  std::unique_ptr<ComponentManager> mComponentManager;
-  std::unique_ptr<EntityManager> mEntityManager;
-  std::unique_ptr<SystemManager> mSystemManager;
-
-public:
-  void Init();
-  // Entity methods
-  Entity CreateEntity();
-  void DestroyEntity(Entity entity);
-  // Component methods
-  template <typename T> void RegisterComponent();
-  template <typename T> void AddComponent(Entity entity, T component);
-  template <typename T> void RemoveComponent(Entity entity);
-  template <typename T> T &GetComponent(Entity entity);
-  template <typename T> ComponentType GetComponentType();
-  // System methods
-  template <typename T> std::shared_ptr<T> RegisterSystem();
-  template <typename T> void SetSystemSignature(Signature signature);
-};
-
-#endif // COORDINATOR_HPP
diff --git a/libs/ecs/entity.cpp b/libs/ecs/entity.cpp
deleted file mode 100644
index 83f7262..0000000
--- a/libs/ecs/entity.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-#include "entity.hpp"
-#include <cassert>
-
-EntityManager::EntityManager() {
-  // Initialize the queue with all possible entity IDs
-  for (Entity entity = 0; entity < MAX_ENTITIES; ++entity) {
-    mAvailableEntities.push(entity);
-  }
-}
-Entity EntityManager::CreateEntity() {
-  assert(mLivingEntityCount < MAX_ENTITIES &&
-         "Too many entities in existence.");
-
-  // Take an ID from the front of the queue
-  Entity id = mAvailableEntities.front();
-  mAvailableEntities.pop();
-  ++mLivingEntityCount;
-
-  return id;
-}
-void EntityManager::DestroyEntity(Entity entity) {
-  assert(entity < MAX_ENTITIES && "Entity out of range.");
-
-  // Invalidate the destroyed entity's signature
-  mSignatures[entity].reset();
-
-  // Put the destroyed ID at the back of the queue
-  mAvailableEntities.push(entity);
-  --mLivingEntityCount;
-}
-void EntityManager::SetSignature(Entity entity, Signature signature) {
-  assert(entity < MAX_ENTITIES && "Entity out of range.");
-
-  // Put this entity's signature into the array
-  mSignatures[entity] = signature;
-}
-Signature EntityManager::GetSignature(Entity entity) {
-  assert(entity < MAX_ENTITIES && "Entity out of range.");
-
-  // Get this entity's signature from the array
-  return mSignatures[entity];
-}
diff --git a/libs/ecs/entity.hpp b/libs/ecs/entity.hpp
deleted file mode 100644
index e2f7a15..0000000
--- a/libs/ecs/entity.hpp
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef ENTITY_HPP
-#define ENTITY_HPP
-
-#include <cstdint>
-#include <queue>
-#include <array>
-#include "component.hpp"
-
-using Entity = std::uint32_t;
-
-const Entity MAX_ENTITIES = 5000;
-
-class EntityManager {
-  // Queue of unused entity IDs
-  std::queue<Entity> mAvailableEntities{};
-
-  // Array of signatures where the index corresponds to the entity ID
-  std::array<Signature, MAX_ENTITIES> mSignatures{};
-
-  // Total living entities - used to keep limits on how many exist
-  uint32_t mLivingEntityCount{};
-
-public:
-  EntityManager();
-  Entity CreateEntity();
-  void DestroyEntity(Entity entity);
-  void SetSignature(Entity entity, Signature signature);
-  Signature GetSignature(Entity entity);
-};
-
-#endif // ENTITY_HPP
diff --git a/libs/ecs/system.cpp b/libs/ecs/system.cpp
deleted file mode 100644
index a7e4ef4..0000000
--- a/libs/ecs/system.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-#include "system.hpp"
-
-#include <cassert>
-
-template <typename T> std::shared_ptr<T> SystemManager::RegisterSystem() {
-  const char *typeName = typeid(T).name();
-
-  assert(mSystems.find(typeName) == mSystems.end() &&
-         "Registering system more than once.");
-
-  // Create a pointer to the system and return it so it can be used externally
-  auto system = std::make_shared<T>();
-  mSystems.insert({typeName, system});
-  return system;
-}
-
-template <typename T> void SystemManager::SetSignature(Signature signature) {
-  const char *typeName = typeid(T).name();
-
-  assert(mSystems.find(typeName) != mSystems.end() &&
-         "System used before registered.");
-
-  // Set the signature for this system
-  mSignatures.insert({typeName, signature});
-}
-
-void SystemManager::EntityDestroyed(Entity entity) {
-  // Erase a destroyed entity from all system lists
-  // mEntities is a set so no check needed
-  for (auto const &pair : mSystems) {
-    auto const &system = pair.second;
-
-    system->mEntities.erase(entity);
-  }
-}
-
-void SystemManager::EntitySignatureChanged(Entity entity,
-                                           Signature entitySignature) {
-  // Notify each system that an entity's signature changed
-  for (auto const &pair : mSystems) {
-    auto const &type = pair.first;
-    auto const &system = pair.second;
-    auto const &systemSignature = mSignatures[type];
-
-    // Entity signature matches system signature - insert into set
-    if ((entitySignature & systemSignature) == systemSignature) {
-      system->mEntities.insert(entity);
-    }
-    // Entity signature does not match system signature - erase from set
-    else {
-      system->mEntities.erase(entity);
-    }
-  }
-}
diff --git a/libs/ecs/system.hpp b/libs/ecs/system.hpp
deleted file mode 100644
index af7e831..0000000
--- a/libs/ecs/system.hpp
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef SYSTEM_HPP
-#define SYSTEM_HPP
-
-#include <set>
-#include <memory>
-#include <unordered_map>
-#include "component.hpp"
-#include "entity.hpp"
-
-class System {
-public:
-  std::set<Entity> mEntities;
-};
-
-class SystemManager {
-  // Map from system type string pointer to a signature
-  std::unordered_map<const char *, Signature> mSignatures{};
-
-  // Map from system type string pointer to a system pointer
-  std::unordered_map<const char *, std::shared_ptr<System>> mSystems{};
-
-public:
-  template <typename T> std::shared_ptr<T> RegisterSystem();
-  template <typename T> void SetSignature(Signature signature);
-  void EntityDestroyed(Entity entity);
-  void EntitySignatureChanged(Entity entity, Signature entitySignature);
-};
-
-#endif // !SYSTEM_HPP
diff --git a/meson.build b/meson.build
index 19160c9..e6a8aed 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,5 @@
 project('test', 'cpp')
 
-sources = []
-
 deps = []
 deps += dependency('fmt')
 deps += dependency('glfw3')
diff --git a/src/components/meson.build b/src/components/meson.build
deleted file mode 100644
index 32f0f06..0000000
--- a/src/components/meson.build
+++ /dev/null
@@ -1 +0,0 @@
-sources += files('shader.cpp', 'shader.hpp')
diff --git a/src/components/shader.cpp b/src/components/shader.cpp
deleted file mode 100644
index 779df45..0000000
--- a/src/components/shader.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "shader.hpp"
-
-Shader::Shader(GLuint shader) { this->shader = shader; }
-void Shader::SetSource(std::string source) { this->SetSource(source.c_str()); }
-void Shader::SetSource(const char *source) {
-  glShaderSource(shader, 1, &source, NULL);
-}
-void Shader::Compile() { glCompileShader(shader); }
-void Shader::Attach(GLuint program) { glAttachShader(program, shader); }
-VertexShader::VertexShader() : Shader(glCreateShader(GL_VERTEX_SHADER)) {}
-FragmentShader::FragmentShader() : Shader(glCreateShader(GL_FRAGMENT_SHADER)) {}
diff --git a/src/main.cpp b/src/main.cpp
index ddf1bfa..b51934e 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2,7 +2,7 @@
 #include <GLFW/glfw3.h>
 #include <fmt/core.h>
 
-#include "systems/windowsystem.hpp"
+#include "systems/window-system.hpp"
 
 void error_callback(int error_code, const char *description) {
   fmt::print("[ERROR - {}] {}\n", error_code, description);
diff --git a/src/meson.build b/src/meson.build
index 8a251b6..bb1cc6f 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,4 +1,2 @@
-sources += files('main.cpp')
-
-subdir('components')
+sources = files('main.cpp')
 subdir('systems')
diff --git a/src/systems/meson.build b/src/systems/meson.build
index db627d1..e42b237 100644
--- a/src/systems/meson.build
+++ b/src/systems/meson.build
@@ -1,6 +1,6 @@
 sources += files(
-  'shadersystem.cpp',
-  'shadersystem.hpp',
-  'windowsystem.cpp',
-  'windowsystem.hpp',
+  'shader-system.cpp',
+  'shader-system.hpp',
+  'window-system.cpp',
+  'window-system.hpp',
 )
diff --git a/src/systems/shadersystem.cpp b/src/systems/shader-system.cpp
similarity index 81%
rename from src/systems/shadersystem.cpp
rename to src/systems/shader-system.cpp
index 6cf2d01..3de31da 100644
--- a/src/systems/shadersystem.cpp
+++ b/src/systems/shader-system.cpp
@@ -1,6 +1,4 @@
-#include "shadersystem.hpp"
-#include <string>
-#include <src/components/shader.hpp>
+#include "shader-system.hpp"
 
 typedef struct Vertex {
   vec2 pos;
@@ -84,3 +82,13 @@ int ShaderSystem::Draw(int width, int height, float time) {
   glDrawArrays(GL_TRIANGLES, 0, 3);
   return 0;
 }
+
+Shader::Shader(GLuint shader) { this->shader = shader; }
+void Shader::SetSource(std::string source) { this->SetSource(source.c_str()); }
+void Shader::SetSource(const char *source) {
+  glShaderSource(shader, 1, &source, NULL);
+}
+void Shader::Compile() { glCompileShader(shader); }
+void Shader::Attach(GLuint program) { glAttachShader(program, shader); }
+VertexShader::VertexShader() : Shader(glCreateShader(GL_VERTEX_SHADER)) {}
+FragmentShader::FragmentShader() : Shader(glCreateShader(GL_FRAGMENT_SHADER)) {}
diff --git a/src/components/shader.hpp b/src/systems/shader-system.hpp
similarity index 58%
rename from src/components/shader.hpp
rename to src/systems/shader-system.hpp
index 58c74c1..145ae75 100644
--- a/src/components/shader.hpp
+++ b/src/systems/shader-system.hpp
@@ -1,10 +1,21 @@
-#ifndef SHADER_HPP
-#define SHADER_HPP
-
-#define SHADER_HPP
 #include <GL/glew.h>
+#include <linmath.h>
 #include <string>
 
+class ShaderSystem {
+  GLuint vertex_buffer;
+  GLuint program;
+  GLint mvp_location;
+  GLint vpos_location;
+  GLint vcol_location;
+  GLuint vertex_array;
+
+public:
+  ShaderSystem();
+  int Draw(int width, int height, float time);
+  GLuint *CreateBuffer();
+};
+
 class Shader {
 public:
   Shader(GLuint shader);
@@ -28,5 +39,3 @@ class FragmentShader : public Shader {
 public:
   FragmentShader();
 };
-
-#endif // SHADER_HPP
diff --git a/src/systems/shadersystem.hpp b/src/systems/shadersystem.hpp
deleted file mode 100644
index c8367fb..0000000
--- a/src/systems/shadersystem.hpp
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef SHADERSYSTEM_HPP
-#define SHADERSYSTEM_HPP
-
-#include <GL/glew.h>
-#include <linmath.h>
-
-class ShaderSystem {
-  GLuint vertex_buffer;
-  GLuint program;
-  GLint mvp_location;
-  GLint vpos_location;
-  GLint vcol_location;
-  GLuint vertex_array;
-
-public:
-  ShaderSystem();
-  int Draw(int width, int height, float time);
-  GLuint *CreateBuffer();
-};
-
-#endif // SHADERSYSTEM_HPP
diff --git a/src/systems/windowsystem.cpp b/src/systems/window-system.cpp
similarity index 93%
rename from src/systems/windowsystem.cpp
rename to src/systems/window-system.cpp
index 3d65a00..626abc0 100644
--- a/src/systems/windowsystem.cpp
+++ b/src/systems/window-system.cpp
@@ -1,4 +1,4 @@
-#include "windowsystem.hpp"
+#include "window-system.hpp"
 
 WindowSystem::WindowSystem(GLFWwindow *window,
                            class ShaderSystem shaderSystem) {
diff --git a/src/systems/windowsystem.hpp b/src/systems/window-system.hpp
similarity index 67%
rename from src/systems/windowsystem.hpp
rename to src/systems/window-system.hpp
index ac26f60..9fd6f59 100644
--- a/src/systems/windowsystem.hpp
+++ b/src/systems/window-system.hpp
@@ -1,9 +1,6 @@
-#ifndef WINDOWSYSTEM_HPP
-#define WINDOWSYSTEM_HPP
-
 #define GLFW_INCLUDE_NONE
 #include <GLFW/glfw3.h>
-#include "shadersystem.hpp"
+#include "shader-system.hpp"
 
 class WindowSystem {
   GLFWwindow *window;
@@ -13,5 +10,3 @@ public:
   WindowSystem(GLFWwindow *window, class ShaderSystem shaderSystem);
   int Loop();
 };
-
-#endif // WINDOWSYSTEM_HPP