diff --git a/.gitignore b/.gitignore
index 577f78d..9dde703 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,3 @@
-# IDEA stuff
-.idea/
-
 # Binaries for programs and plugins
 *.exe
 *.exe~
@@ -19,5 +16,3 @@
 .DS_Store
 
 /bin
-
-/src/src
diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..0e40fe8
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,3 @@
+
+# Default ignored files
+/workspace.xml
\ No newline at end of file
diff --git a/.idea/ImpactServer.iml b/.idea/ImpactServer.iml
new file mode 100644
index 0000000..5e764c4
--- /dev/null
+++ b/.idea/ImpactServer.iml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="Go" enabled="true" />
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..28a804d
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..e044707
--- /dev/null
+++ b/.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$/.idea/ImpactServer.iml" filepath="$PROJECT_DIR$/.idea/ImpactServer.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Run.xml b/.idea/runConfigurations/Run.xml
new file mode 100644
index 0000000..ec4dd91
--- /dev/null
+++ b/.idea/runConfigurations/Run.xml
@@ -0,0 +1,12 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Run" type="GoApplicationRunConfiguration" factoryName="Go Application">
+    <module name="ImpactServer" />
+    <working_directory value="$PROJECT_DIR$/" />
+    <go_parameters value="-i" />
+    <kind value="PACKAGE" />
+    <filePath value="$PROJECT_DIR$/" />
+    <package value="github.com/ImpactDevelopment/ImpactServer/src/" />
+    <directory value="$PROJECT_DIR$/" />
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..3fdc099
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+  <component name="IssueNavigationConfiguration">
+    <option name="links">
+      <list>
+        <IssueNavigationLink>
+          <option name="issueRegexp" value="([^/# ]+)/([^/# ]+)#([0-9]+)" />
+          <option name="linkRegexp" value="https://github.com/$1/$2/issues/$3" />
+        </IssueNavigationLink>
+        <IssueNavigationLink>
+          <option name="issueRegexp" value="/([^/# ]+)/([^/# ]+)/issues/([0-9]+)" />
+          <option name="linkRegexp" value="https://github.com/$1/$2/issues/$3" />
+        </IssueNavigationLink>
+        <IssueNavigationLink>
+          <option name="issueRegexp" value="#([0-9]+)" />
+          <option name="linkRegexp" value="https://github.com/ImpactDevelopment/ImpactServer/issues/$1" />
+        </IssueNavigationLink>
+      </list>
+    </option>
+  </component>
+</project>
\ No newline at end of file