diff --git a/src/Entity.cpp b/src/Entity.cpp
new file mode 100644
index 0000000..8fb9f04
--- /dev/null
+++ b/src/Entity.cpp
@@ -0,0 +1 @@
+#include "Entity.h"
diff --git a/src/Entity.h b/src/Entity.h
new file mode 100644
index 0000000..af35ce2
--- /dev/null
+++ b/src/Entity.h
@@ -0,0 +1,5 @@
+#pragma once
+
+class Entity {
+
+};
diff --git a/src/Game.cpp b/src/Game.cpp
new file mode 100644
index 0000000..567bc2f
--- /dev/null
+++ b/src/Game.cpp
@@ -0,0 +1,2 @@
+#include "Game.h"
+
diff --git a/src/Game.h b/src/Game.h
new file mode 100644
index 0000000..fe19c60
--- /dev/null
+++ b/src/Game.h
@@ -0,0 +1,5 @@
+#pragma once
+
+class Game {
+
+};
diff --git a/src/Player.cpp b/src/Player.cpp
index e140eae..081178d 100644
--- a/src/Player.cpp
+++ b/src/Player.cpp
@@ -1,14 +1,6 @@
 #include "Player.h"
 #include <iostream>
 
-void Player::OnCoinCollect(CoinCollectEvent *event) {
-	std::cout << event->value << std::endl;
-}
-
-void Player::OnDamage(DamageEvent *event) {
-	std::cout << event->amount << std::endl;
-}
-
 void Player::OnMouseClicked() {
 	std::cout << "Mouse clicked\n";
 }
diff --git a/src/Player.h b/src/Player.h
index 36bf97e..241e8b4 100644
--- a/src/Player.h
+++ b/src/Player.h
@@ -2,10 +2,9 @@
 
 #include "Listener.h"
 #include "Event.h"
+#include "Entity.h"
 
-class Player : public GameListener, public InputListener {
+class Player : public Entity, public GameListener, public InputListener {
 protected:
-	void OnCoinCollect(CoinCollectEvent * event) override;
-	void OnDamage(DamageEvent * event) override;
 	void OnMouseClicked() override;
 };
\ No newline at end of file
diff --git a/src/Spectator.cpp b/src/Spectator.cpp
new file mode 100644
index 0000000..0e1336c
--- /dev/null
+++ b/src/Spectator.cpp
@@ -0,0 +1,7 @@
+#include "Spectator.h"
+
+#include <iostream>
+
+void Spectator::OnCoinCollect(CoinCollectEvent *event) {
+	std::cout << "Someone collected a coin\n";
+}
diff --git a/src/Spectator.h b/src/Spectator.h
new file mode 100644
index 0000000..4dd8126
--- /dev/null
+++ b/src/Spectator.h
@@ -0,0 +1,9 @@
+#pragma once
+
+#include "Entity.h"
+#include "Listener.h"
+
+class Spectator : public Entity, public GameListener {
+protected:
+	void OnCoinCollect(CoinCollectEvent *event) override;
+};
diff --git a/src/Window.cpp b/src/Window.cpp
new file mode 100644
index 0000000..ab55ba0
--- /dev/null
+++ b/src/Window.cpp
@@ -0,0 +1 @@
+#include "Window.h"
diff --git a/src/Window.h b/src/Window.h
new file mode 100644
index 0000000..bc30a66
--- /dev/null
+++ b/src/Window.h
@@ -0,0 +1,7 @@
+#pragma once
+
+#include <QWidget>
+
+class Window : public QWidget {
+
+};
diff --git a/src/main.cpp b/src/main.cpp
index 4efc0fb..ca58e58 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -5,6 +5,7 @@
 #include "Audio.h"
 #include "FileManager.h"
 #include "Player.h"
+#include "Window.h"
 
 using std::cout, std::endl;
 
@@ -39,7 +40,7 @@ int main(int argc, char * argv[]){
 	gameQueue->submitEvent<CoinCollectEvent>(new CoinCollectEvent);
 	gameQueue->submitEvent<DamageEvent>(new DamageEvent);
 
-	QWidget window;
+	Window window;
 	window.show();
 
 	return QApplication::exec();