diff --git a/CMakeLists.txt b/CMakeLists.txt
index a092420..e77d817 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,7 +13,8 @@ qt_standard_project_setup()
 # ===========================Including Project Files===========================
 set(FORMS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/forms")
 set(SOURCE_DIR "${CMAKE_SOURCE_DIR}/src")
-set(SOURCE_TWITCH_DIR "${CMAKE_SOURCE_DIR}/src/twitch")
+set(SOURCE_STREAMING_SERVICES_DIR "${CMAKE_SOURCE_DIR}/src/services/streaming")
+set(SOURCE_TWITCH_DIR "${CMAKE_SOURCE_DIR}/src/services/streaming/twitch")
 set(SOURCE_GOSU_DIR "${CMAKE_SOURCE_DIR}/src/gosu")
 set(SOURCE_OSUIRC_DIR "${CMAKE_SOURCE_DIR}/src/osuirc")
 set(SOURCE_UTILS_DIR "${CMAKE_SOURCE_DIR}/src/utils")
@@ -30,6 +31,7 @@ set(SOURCE_ABOUT_DIR "${CMAKE_SOURCE_DIR}/src/about")
 include_directories(
 	${FORMS_DIR}
 	${SOURCE_DIR}
+	${SOURCE_STREAMING_SERVICES_DIR}
 	${SOURCE_TWITCH_DIR}
 	${SOURCE_GOSU_DIR}
 	${SOURCE_OSUIRC_DIR}
@@ -46,6 +48,8 @@ include_directories(
 
 file(GLOB_RECURSE SOURCES
 	${FORMS_DIR}/*.cpp
+	${SOURCE_STREAMING_SERVICES_DIR}/*.h
+	${SOURCE_STREAMING_SERVICES_DIR}/*.cpp
 	${SOURCE_TWITCH_DIR}/*.h
 	${SOURCE_TWITCH_DIR}/*.cpp
 	${SOURCE_GOSU_DIR}/*.h
diff --git a/src/services/streaming/streamingServiceDataWrapper.h b/src/services/streaming/streamingServiceDataWrapper.h
new file mode 100644
index 0000000..7f957f4
--- /dev/null
+++ b/src/services/streaming/streamingServiceDataWrapper.h
@@ -0,0 +1,13 @@
+#ifndef STREAMINGSERVICEDATAWRAPPER_H
+#define STREAMINGSERVICEDATAWRAPPER_H
+
+#include <QString>
+
+class StreamingServiceDataWrapper
+{
+public:
+	virtual QString getMessage() = 0;
+	virtual QString getUsername() = 0;
+};
+
+#endif // STREAMINGSERVICEDATAWRAPPER_H
diff --git a/src/twitch/twitchClient.cpp b/src/services/streaming/twitch/twitchClient.cpp
similarity index 100%
rename from src/twitch/twitchClient.cpp
rename to src/services/streaming/twitch/twitchClient.cpp
diff --git a/src/twitch/twitchClient.h b/src/services/streaming/twitch/twitchClient.h
similarity index 100%
rename from src/twitch/twitchClient.h
rename to src/services/streaming/twitch/twitchClient.h
diff --git a/src/twitch/twitchdatawrapper.cpp b/src/services/streaming/twitch/twitchdatawrapper.cpp
similarity index 100%
rename from src/twitch/twitchdatawrapper.cpp
rename to src/services/streaming/twitch/twitchdatawrapper.cpp
diff --git a/src/twitch/twitchdatawrapper.h b/src/services/streaming/twitch/twitchdatawrapper.h
similarity index 73%
rename from src/twitch/twitchdatawrapper.h
rename to src/services/streaming/twitch/twitchdatawrapper.h
index f22cdfa..98ceafb 100644
--- a/src/twitch/twitchdatawrapper.h
+++ b/src/services/streaming/twitch/twitchdatawrapper.h
@@ -2,8 +2,9 @@
 #define TWITCHDATAWRAPPER_H
 
 #include <QString>
+#include "streamingServiceDataWrapper.h"
 
-class TwitchDataWrapper
+class TwitchDataWrapper : public StreamingServiceDataWrapper
 {
 public:
 	TwitchDataWrapper(QString &data);