diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 1f1025f..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-.idea
-.DS_Store
\ No newline at end of file
diff --git a/team25.iml b/.idea/team25.iml
similarity index 69%
rename from team25.iml
rename to .idea/team25.iml
index c90834f..d6ebd48 100644
--- a/team25.iml
+++ b/.idea/team25.iml
@@ -2,9 +2,7 @@
 <module type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
+    <content url="file://$MODULE_DIR$" />
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
diff --git a/Server/.idea/.gitignore b/Server/.idea/.gitignore
new file mode 100644
index 0000000..e5968a1
--- /dev/null
+++ b/Server/.idea/.gitignore
@@ -0,0 +1,13 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+*.class
+.gradle
+/build/
+!gradle-wrapper.jar
+
+# Cache of project
+.gradletasknamecache
+
+# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
+# gradle/wrapper/gradle-wrapper.properties
diff --git a/Server/.idea/gradle.xml b/Server/.idea/gradle.xml
new file mode 100644
index 0000000..ba1ec5c
--- /dev/null
+++ b/Server/.idea/gradle.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GradleSettings">
+    <option name="linkedExternalProjectsSettings">
+      <GradleProjectSettings>
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="modules">
+          <set>
+            <option value="$PROJECT_DIR$" />
+          </set>
+        </option>
+      </GradleProjectSettings>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/Server/.idea/misc.xml b/Server/.idea/misc.xml
new file mode 100644
index 0000000..1700c77
--- /dev/null
+++ b/Server/.idea/misc.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_15" default="true" project-jdk-name="15" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/Server/.idea/modules.xml b/Server/.idea/modules.xml
new file mode 100644
index 0000000..7ec00e1
--- /dev/null
+++ b/Server/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/Server.iml" filepath="$PROJECT_DIR$/Server.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/Server/.idea/vcs.xml b/Server/.idea/vcs.xml
new file mode 100644
index 0000000..6c0b863
--- /dev/null
+++ b/Server/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/Server/Server.iml b/Server/Server.iml
new file mode 100644
index 0000000..250ca73
--- /dev/null
+++ b/Server/Server.iml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="Server" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$/">
+      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/build" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/Server/build.gradle b/Server/build.gradle
new file mode 100644
index 0000000..e026250
--- /dev/null
+++ b/Server/build.gradle
@@ -0,0 +1,2 @@
+apply plugin: 'idea'
+apply plugin: 'java'
\ No newline at end of file
diff --git a/Server/src/uulm/teamname/marvelous/server/LobbyManager/MessageRelay.java b/Server/src/uulm/teamname/marvelous/server/LobbyManager/MessageRelay.java
new file mode 100644
index 0000000..d5b4673
--- /dev/null
+++ b/Server/src/uulm/teamname/marvelous/server/LobbyManager/MessageRelay.java
@@ -0,0 +1,4 @@
+package uulm.teamname.marvelous.server.LobbyManager;
+
+public class MessageRelay {
+}
diff --git a/Server/src/uulm/teamname/marvelous/server/LobbyManager/MessageSource.java b/Server/src/uulm/teamname/marvelous/server/LobbyManager/MessageSource.java
new file mode 100644
index 0000000..f3a88ff
--- /dev/null
+++ b/Server/src/uulm/teamname/marvelous/server/LobbyManager/MessageSource.java
@@ -0,0 +1,7 @@
+package uulm.teamname.marvelous.server.LobbyManager;
+
+public enum MessageSource {
+    Player1,
+    Player2,
+    Spectator,
+}