diff --git a/Artemis/Artemis/App.config b/Artemis/Artemis/App.config
index 6bdcc9d54..1476d2e14 100644
--- a/Artemis/Artemis/App.config
+++ b/Artemis/Artemis/App.config
@@ -4,6 +4,7 @@
   <configSections>
     <sectionGroup name="userSettings"
                   type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+      <section name="Artemis.Modules.Games.CounterStrike.CounterStrike" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
       <section name="Artemis.Settings.CounterStrike" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
       <section name="Artemis.Settings.VolumeDisplay" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
       <section name="Artemis.Settings.AudioVisualization"
@@ -27,6 +28,32 @@
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
   </startup>
   <userSettings>
+    <Artemis.Modules.Games.CounterStrike.CounterStrike>
+      <setting name="GameDirectory" serializeAs="String">
+        <value />
+      </setting>
+      <setting name="AmmoEnabled" serializeAs="String">
+        <value>True</value>
+      </setting>
+      <setting name="AmmoMainColor" serializeAs="String">
+        <value>#FFFF2900</value>
+      </setting>
+      <setting name="AmmoSecondaryColor" serializeAs="String">
+        <value>#FF26F600</value>
+      </setting>
+      <setting name="TeamColorEnabled" serializeAs="String">
+        <value>True</value>
+      </setting>
+      <setting name="FlashEnabled" serializeAs="String">
+        <value>True</value>
+      </setting>
+      <setting name="SmokeEnabled" serializeAs="String">
+        <value>True</value>
+      </setting>
+      <setting name="LowHpEnabled" serializeAs="String">
+        <value>True</value>
+      </setting>
+    </Artemis.Modules.Games.CounterStrike.CounterStrike>
     <Artemis.Settings.CounterStrike>
       <setting name="GameDirectory" serializeAs="String">
         <value>C:\Program Files (x86)\Steam\steamapps\common\Counter-Strike Global Offensive</value>
diff --git a/Artemis/Artemis/Artemis.csproj b/Artemis/Artemis/Artemis.csproj
index bb293378d..552c528a1 100644
--- a/Artemis/Artemis/Artemis.csproj
+++ b/Artemis/Artemis/Artemis.csproj
@@ -168,18 +168,43 @@
     <Compile Include="KeyboardProviders\Logitech\Utilities\OrionUtilities.cs" />
     <Compile Include="KeyboardProviders\ProviderHelper.cs" />
     <Compile Include="Models\EffectModel.cs" />
+    <Compile Include="Modules\Effects\AudioVisualizer\AudioVisualization.Designer.cs">
+      <DependentUpon>AudioVisualization.settings</DependentUpon>
+      <AutoGen>True</AutoGen>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
     <Compile Include="Modules\Effects\AudioVisualizer\AudioVisualizerModel.cs" />
     <Compile Include="Modules\Effects\Debug\DebugEffectModel.cs" />
     <Compile Include="Modules\Effects\TypeHole\TypeHoleModel.cs" />
+    <Compile Include="Modules\Effects\TypeWave\TypeWave.Designer.cs">
+      <DependentUpon>TypeWave.settings</DependentUpon>
+      <AutoGen>True</AutoGen>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
     <Compile Include="Modules\Effects\TypeWave\TypeWaveModel.cs" />
     <Compile Include="Models\GameModel.cs" />
+    <Compile Include="Modules\Games\CounterStrike\CounterStrike.Designer.cs">
+      <DependentUpon>CounterStrike.settings</DependentUpon>
+      <AutoGen>True</AutoGen>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
     <Compile Include="Modules\Games\CounterStrike\CounterStrikeModel.cs" />
     <Compile Include="Modules\Games\CounterStrike\CounterStrikeSettings.cs" />
+    <Compile Include="Modules\Games\RocketLeague\RocketLeague.Designer.cs">
+      <DependentUpon>RocketLeague.settings</DependentUpon>
+      <AutoGen>True</AutoGen>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
     <Compile Include="Modules\Games\RocketLeague\RocketLeagueModel.cs" />
     <Compile Include="Modules\Games\Witcher3\Witcher3Model.cs" />
     <Compile Include="Models\MainModel.cs" />
     <Compile Include="Models\OverlayModel.cs" />
     <Compile Include="Modules\Overlays\VolumeDisplay\VolumeDisplay.cs" />
+    <Compile Include="Modules\Overlays\VolumeDisplay\VolumeDisplay.Designer.cs">
+      <DependentUpon>VolumeDisplay.settings</DependentUpon>
+      <AutoGen>True</AutoGen>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
     <Compile Include="Modules\Overlays\VolumeDisplay\VolumeDisplayModel.cs" />
     <Compile Include="Modules\Effects\AudioVisualizer\AudioVisualizerSettings.cs" />
     <Compile Include="Modules\Effects\Debug\DebugEffectSettings.cs" />
@@ -188,36 +213,11 @@
     <Compile Include="Modules\Games\RocketLeague\RocketLeagueSettings.cs" />
     <Compile Include="Modules\Effects\TypeWave\TypeWaveSettings.cs" />
     <Compile Include="Properties\Annotations.cs" />
-    <Compile Include="Settings\AudioVisualization.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>AudioVisualization.settings</DependentUpon>
-    </Compile>
-    <Compile Include="Settings\CounterStrike.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>CounterStrike.settings</DependentUpon>
-    </Compile>
     <Compile Include="Settings\General.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
       <DependentUpon>General.settings</DependentUpon>
     </Compile>
-    <Compile Include="Settings\RocketLeague.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>RocketLeague.settings</DependentUpon>
-    </Compile>
-    <Compile Include="Settings\TypeWave.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>TypeWave.settings</DependentUpon>
-    </Compile>
-    <Compile Include="Settings\VolumeDisplay.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>VolumeDisplay.settings</DependentUpon>
-    </Compile>
     <Compile Include="Utilities\Audio\FftEventArgs.cs" />
     <Compile Include="Utilities\Audio\SampleAggregator.cs" />
     <Compile Include="Utilities\ColorHelpers.cs" />
@@ -294,32 +294,32 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    <None Include="packages.config" />
-    <AppDesigner Include="Properties\" />
-    <None Include="Settings\CounterStrike.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>CounterStrike.Designer.cs</LastGenOutput>
-    </None>
-    <None Include="Settings\VolumeDisplay.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>VolumeDisplay.Designer.cs</LastGenOutput>
-    </None>
-    <Resource Include="Resources\Entypo.ttf" />
-    <None Include="Settings\AudioVisualization.settings">
+    <None Include="Modules\Effects\AudioVisualizer\AudioVisualization.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>AudioVisualization.Designer.cs</LastGenOutput>
     </None>
-    <None Include="Settings\General.settings">
+    <None Include="Modules\Effects\TypeWave\TypeWave.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>General.Designer.cs</LastGenOutput>
+      <LastGenOutput>TypeWave.Designer.cs</LastGenOutput>
     </None>
-    <None Include="Settings\RocketLeague.settings">
+    <None Include="Modules\Games\CounterStrike\CounterStrike.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>CounterStrike.Designer.cs</LastGenOutput>
+    </None>
+    <None Include="Modules\Games\RocketLeague\RocketLeague.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>RocketLeague.Designer.cs</LastGenOutput>
     </None>
-    <None Include="Settings\TypeWave.settings">
+    <None Include="Modules\Overlays\VolumeDisplay\VolumeDisplay.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>TypeWave.Designer.cs</LastGenOutput>
+      <LastGenOutput>VolumeDisplay.Designer.cs</LastGenOutput>
+    </None>
+    <None Include="packages.config" />
+    <AppDesigner Include="Properties\" />
+    <Resource Include="Resources\Entypo.ttf" />
+    <None Include="Settings\General.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>General.Designer.cs</LastGenOutput>
     </None>
   </ItemGroup>
   <ItemGroup>
@@ -388,6 +388,7 @@
     <Content Include="LogitechLedEnginesWrapper.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Resources\gamestateConfigFileCsGo.txt" />
     <Resource Include="Resources\Entypo-license.txt" />
     <Resource Include="Resources\WindowsIcons-license.txt" />
   </ItemGroup>
diff --git a/Artemis/Artemis/Settings/AudioVisualization.Designer.cs b/Artemis/Artemis/Modules/Effects/AudioVisualizer/AudioVisualization.Designer.cs
similarity index 98%
rename from Artemis/Artemis/Settings/AudioVisualization.Designer.cs
rename to Artemis/Artemis/Modules/Effects/AudioVisualizer/AudioVisualization.Designer.cs
index c9ebb22f0..1e2e4c35e 100644
--- a/Artemis/Artemis/Settings/AudioVisualization.Designer.cs
+++ b/Artemis/Artemis/Modules/Effects/AudioVisualizer/AudioVisualization.Designer.cs
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Artemis.Settings {
+namespace Artemis.Modules.Effects.AudioVisualizer {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
diff --git a/Artemis/Artemis/Settings/AudioVisualization.settings b/Artemis/Artemis/Modules/Effects/AudioVisualizer/AudioVisualization.settings
similarity index 100%
rename from Artemis/Artemis/Settings/AudioVisualization.settings
rename to Artemis/Artemis/Modules/Effects/AudioVisualizer/AudioVisualization.settings
diff --git a/Artemis/Artemis/Settings/TypeWave.Designer.cs b/Artemis/Artemis/Modules/Effects/TypeWave/TypeWave.Designer.cs
similarity index 100%
rename from Artemis/Artemis/Settings/TypeWave.Designer.cs
rename to Artemis/Artemis/Modules/Effects/TypeWave/TypeWave.Designer.cs
diff --git a/Artemis/Artemis/Settings/TypeWave.settings b/Artemis/Artemis/Modules/Effects/TypeWave/TypeWave.settings
similarity index 100%
rename from Artemis/Artemis/Settings/TypeWave.settings
rename to Artemis/Artemis/Modules/Effects/TypeWave/TypeWave.settings
diff --git a/Artemis/Artemis/Settings/CounterStrike.Designer.cs b/Artemis/Artemis/Modules/Games/CounterStrike/CounterStrike.Designer.cs
similarity index 97%
rename from Artemis/Artemis/Settings/CounterStrike.Designer.cs
rename to Artemis/Artemis/Modules/Games/CounterStrike/CounterStrike.Designer.cs
index f5ef2a393..bc7c0a518 100644
--- a/Artemis/Artemis/Settings/CounterStrike.Designer.cs
+++ b/Artemis/Artemis/Modules/Games/CounterStrike/CounterStrike.Designer.cs
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Artemis.Settings {
+namespace Artemis.Modules.Games.CounterStrike {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
@@ -25,7 +25,7 @@ namespace Artemis.Settings {
         
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("C:\\Program Files (x86)\\Steam\\steamapps\\common\\Counter-Strike Global Offensive")]
+        [global::System.Configuration.DefaultSettingValueAttribute("")]
         public string GameDirectory {
             get {
                 return ((string)(this["GameDirectory"]));
diff --git a/Artemis/Artemis/Settings/CounterStrike.settings b/Artemis/Artemis/Modules/Games/CounterStrike/CounterStrike.settings
similarity index 87%
rename from Artemis/Artemis/Settings/CounterStrike.settings
rename to Artemis/Artemis/Modules/Games/CounterStrike/CounterStrike.settings
index 7c4699118..75e9907fb 100644
--- a/Artemis/Artemis/Settings/CounterStrike.settings
+++ b/Artemis/Artemis/Modules/Games/CounterStrike/CounterStrike.settings
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="Artemis.Settings" GeneratedClassName="CounterStrike">
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="Artemis.Modules.Games.CounterStrike" GeneratedClassName="CounterStrike">
   <Profiles />
   <Settings>
     <Setting Name="GameDirectory" Type="System.String" Scope="User">
-      <Value Profile="(Default)">C:\Program Files (x86)\Steam\steamapps\common\Counter-Strike Global Offensive</Value>
+      <Value Profile="(Default)" />
     </Setting>
     <Setting Name="AmmoEnabled" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
diff --git a/Artemis/Artemis/Modules/Games/CounterStrike/CounterStrikeSettings.cs b/Artemis/Artemis/Modules/Games/CounterStrike/CounterStrikeSettings.cs
index de0681263..2cc2f3519 100644
--- a/Artemis/Artemis/Modules/Games/CounterStrike/CounterStrikeSettings.cs
+++ b/Artemis/Artemis/Modules/Games/CounterStrike/CounterStrikeSettings.cs
@@ -23,37 +23,37 @@ namespace Artemis.Modules.Games.CounterStrike
 
         public override sealed void Load()
         {
-            GameDirectory = Settings.CounterStrike.Default.GameDirectory;
+            GameDirectory = CounterStrike.Default.GameDirectory;
 
-            AmmoEnabled = Settings.CounterStrike.Default.AmmoEnabled;
-            AmmoMainColor = Settings.CounterStrike.Default.AmmoMainColor;
-            AmmoSecondaryColor = Settings.CounterStrike.Default.AmmoSecondaryColor;
+            AmmoEnabled = CounterStrike.Default.AmmoEnabled;
+            AmmoMainColor = CounterStrike.Default.AmmoMainColor;
+            AmmoSecondaryColor = CounterStrike.Default.AmmoSecondaryColor;
 
-            TeamColorEnabled = Settings.CounterStrike.Default.TeamColorEnabled;
-            FlashEnabled = Settings.CounterStrike.Default.FlashEnabled;
-            SmokeEnabled = Settings.CounterStrike.Default.SmokeEnabled;
-            LowHpEnabled = Settings.CounterStrike.Default.LowHpEnabled;
+            TeamColorEnabled = CounterStrike.Default.TeamColorEnabled;
+            FlashEnabled = CounterStrike.Default.FlashEnabled;
+            SmokeEnabled = CounterStrike.Default.SmokeEnabled;
+            LowHpEnabled = CounterStrike.Default.LowHpEnabled;
         }
 
         public override sealed void Save()
         {
-            Settings.CounterStrike.Default.GameDirectory = GameDirectory;
+            CounterStrike.Default.GameDirectory = GameDirectory;
 
-            Settings.CounterStrike.Default.AmmoEnabled = AmmoEnabled;
-            Settings.CounterStrike.Default.AmmoMainColor = AmmoMainColor;
-            Settings.CounterStrike.Default.AmmoSecondaryColor = AmmoSecondaryColor;
+            CounterStrike.Default.AmmoEnabled = AmmoEnabled;
+            CounterStrike.Default.AmmoMainColor = AmmoMainColor;
+            CounterStrike.Default.AmmoSecondaryColor = AmmoSecondaryColor;
 
-            Settings.CounterStrike.Default.TeamColorEnabled = TeamColorEnabled;
-            Settings.CounterStrike.Default.FlashEnabled = FlashEnabled;
-            Settings.CounterStrike.Default.SmokeEnabled = SmokeEnabled;
-            Settings.CounterStrike.Default.LowHpEnabled = LowHpEnabled;
+            CounterStrike.Default.TeamColorEnabled = TeamColorEnabled;
+            CounterStrike.Default.FlashEnabled = FlashEnabled;
+            CounterStrike.Default.SmokeEnabled = SmokeEnabled;
+            CounterStrike.Default.LowHpEnabled = LowHpEnabled;
 
-            Settings.CounterStrike.Default.Save();
+            CounterStrike.Default.Save();
         }
 
         public override sealed void ToDefault()
         {
-            GameDirectory = @"C:\Program Files (x86)\Steam\steamapps\common\Counter-Strike Global Offensive";
+            GameDirectory = string.Empty;
 
             AmmoEnabled = true;
             AmmoMainColor = Color.FromArgb(255, 38, 246, 0);
diff --git a/Artemis/Artemis/Modules/Games/CounterStrike/CounterStrikeView.xaml b/Artemis/Artemis/Modules/Games/CounterStrike/CounterStrikeView.xaml
index 87240a179..d6d9746c0 100644
--- a/Artemis/Artemis/Modules/Games/CounterStrike/CounterStrikeView.xaml
+++ b/Artemis/Artemis/Modules/Games/CounterStrike/CounterStrikeView.xaml
@@ -43,7 +43,7 @@
             <Label FontSize="16" Content="CS:GO Directory" Style="{DynamicResource DescriptionHeaderStyle}"
                    FontFamily="Segoe UI Semibold" Foreground="#535353" Width="130" HorizontalAlignment="Left" />
             <Grid>
-                <TextBox x:Name="GameDirectory" Height="23" TextWrapping="Wrap" Margin="5,0,30,0" Text="{Binding Path=CounterStrikeSettings.GameDirectory, Mode=TwoWay}" cal:Message.Attach="[Event LostFocus] = [Action CheckGameDirectory]" />
+                <TextBox x:Name="GameDirectory" Height="23" TextWrapping="Wrap" Margin="5,0,30,0" Text="{Binding Path=CounterStrikeSettings.GameDirectory, Mode=TwoWay}" cal:Message.Attach="[Event LostFocus] = [Action PlaceConfigFile]" />
                 <Button x:Name="BrowseDirectory" Content="..." RenderTransformOrigin="-0.039,-0.944" HorizontalAlignment="Right" Width="25"
                         Style="{DynamicResource SquareButtonStyle}" Height="25"/>
             </Grid>
diff --git a/Artemis/Artemis/Modules/Games/CounterStrike/CounterStrikeViewModel.cs b/Artemis/Artemis/Modules/Games/CounterStrike/CounterStrikeViewModel.cs
index cb5f3d9be..018040e87 100644
--- a/Artemis/Artemis/Modules/Games/CounterStrike/CounterStrikeViewModel.cs
+++ b/Artemis/Artemis/Modules/Games/CounterStrike/CounterStrikeViewModel.cs
@@ -1,4 +1,5 @@
-using System.IO;
+using System;
+using System.IO;
 using System.Windows.Forms;
 using Artemis.Models;
 using Screen = Caliburn.Micro.Screen;
@@ -19,6 +20,7 @@ namespace Artemis.Modules.Games.CounterStrike
             // Create effect model and add it to MainModel
             CounterStrikeModel = new CounterStrikeModel(CounterStrikeSettings, MainModel);
             MainModel.EffectModels.Add(CounterStrikeModel);
+            PlaceConfigFile();
         }
 
         public CounterStrikeSettings CounterStrikeSettings
@@ -48,19 +50,23 @@ namespace Artemis.Modules.Games.CounterStrike
 
             CounterStrikeSettings.GameDirectory = dialog.SelectedPath;
             NotifyOfPropertyChange(() => CounterStrikeSettings);
-            CheckGameDirectory();
+            PlaceConfigFile();
         }
 
-        public void CheckGameDirectory()
+        public void PlaceConfigFile()
         {
-            if (Directory.Exists(CounterStrikeSettings.GameDirectory + "/csgo/cfg"))
+            if (CounterStrikeSettings.GameDirectory == string.Empty)
                 return;
+            if (Directory.Exists(CounterStrikeSettings.GameDirectory + "/csgo/cfg"))
+            {
+                var cfgFile = Properties.Resources.gamestateConfigFileCsGo.Replace("{{port}}", MainModel.GameSenseWebServer.Port.ToString());
+                File.WriteAllText(CounterStrikeSettings.GameDirectory + "/csgo/cfg/gamestate_integration_artemis.cfg", cfgFile);
+                return;
+            }
 
             MessageBox.Show("Please select a valid CS:GO directory");
-            CounterStrikeSettings.GameDirectory = @"C:\Program Files (x86)\Steam\steamapps\common\Counter-Strike Global Offensive";
+            CounterStrikeSettings.GameDirectory = string.Empty;
             NotifyOfPropertyChange(() => CounterStrikeSettings);
-
-            // TODO: Place config file in CS dir
         }
 
         public void SaveSettings()
diff --git a/Artemis/Artemis/Settings/RocketLeague.Designer.cs b/Artemis/Artemis/Modules/Games/RocketLeague/RocketLeague.Designer.cs
similarity index 100%
rename from Artemis/Artemis/Settings/RocketLeague.Designer.cs
rename to Artemis/Artemis/Modules/Games/RocketLeague/RocketLeague.Designer.cs
diff --git a/Artemis/Artemis/Settings/RocketLeague.settings b/Artemis/Artemis/Modules/Games/RocketLeague/RocketLeague.settings
similarity index 100%
rename from Artemis/Artemis/Settings/RocketLeague.settings
rename to Artemis/Artemis/Modules/Games/RocketLeague/RocketLeague.settings
diff --git a/Artemis/Artemis/Settings/VolumeDisplay.Designer.cs b/Artemis/Artemis/Modules/Overlays/VolumeDisplay/VolumeDisplay.Designer.cs
similarity index 100%
rename from Artemis/Artemis/Settings/VolumeDisplay.Designer.cs
rename to Artemis/Artemis/Modules/Overlays/VolumeDisplay/VolumeDisplay.Designer.cs
diff --git a/Artemis/Artemis/Settings/VolumeDisplay.settings b/Artemis/Artemis/Modules/Overlays/VolumeDisplay/VolumeDisplay.settings
similarity index 100%
rename from Artemis/Artemis/Settings/VolumeDisplay.settings
rename to Artemis/Artemis/Modules/Overlays/VolumeDisplay/VolumeDisplay.settings
diff --git a/Artemis/Artemis/Properties/Resources.Designer.cs b/Artemis/Artemis/Properties/Resources.Designer.cs
index 228783ca0..5765a8156 100644
--- a/Artemis/Artemis/Properties/Resources.Designer.cs
+++ b/Artemis/Artemis/Properties/Resources.Designer.cs
@@ -8,10 +8,10 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Artemis.Properties
-{
-
-
+namespace Artemis.Properties {
+    using System;
+    
+    
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
@@ -22,50 +22,68 @@ namespace Artemis.Properties
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources
-    {
-
+    internal class Resources {
+        
         private static global::System.Resources.ResourceManager resourceMan;
-
+        
         private static global::System.Globalization.CultureInfo resourceCulture;
-
+        
         [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources()
-        {
+        internal Resources() {
         }
-
+        
         /// <summary>
         ///   Returns the cached ResourceManager instance used by this class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager
-        {
-            get
-            {
-                if ((resourceMan == null))
-                {
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
                     global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Artemis.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
             }
         }
-
+        
         /// <summary>
         ///   Overrides the current thread's CurrentUICulture property for all
         ///   resource lookups using this strongly typed resource class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture
-        {
-            get
-            {
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
                 return resourceCulture;
             }
-            set
-            {
+            set {
                 resourceCulture = value;
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to &quot;Artemis&quot;
+        ///{
+        /// &quot;uri&quot; &quot;{{address}}/csgo_game_event&quot;
+        /// &quot;timeout&quot; &quot;5.0&quot;
+        /// &quot;buffer&quot;  &quot;0.1&quot;
+        /// &quot;throttle&quot; &quot;0.1&quot;
+        /// &quot;heartbeat&quot; &quot;30.0&quot;
+        /// &quot;data&quot;
+        /// {
+        ///   &quot;provider&quot;            &quot;1&quot;
+        ///   &quot;map&quot;                 &quot;1&quot;
+        ///   &quot;round&quot;               &quot;1&quot;
+        ///   &quot;player_id&quot;           &quot;1&quot;
+        ///   &quot;player_state&quot;        &quot;1&quot;
+        ///   &quot;player_weapons&quot;      &quot;1&quot;
+        ///   &quot;player_match_stats&quot;  &quot;1&quot;
+        /// }
+        ///}.
+        /// </summary>
+        internal static string gamestateConfigFileCsGo {
+            get {
+                return ResourceManager.GetString("gamestateConfigFileCsGo", resourceCulture);
+            }
+        }
     }
 }
diff --git a/Artemis/Artemis/Properties/Resources.resx b/Artemis/Artemis/Properties/Resources.resx
index af7dbebba..775c9f736 100644
--- a/Artemis/Artemis/Properties/Resources.resx
+++ b/Artemis/Artemis/Properties/Resources.resx
@@ -46,7 +46,7 @@
     
     mimetype: application/x-microsoft.net.object.binary.base64
     value   : The object must be serialized with 
-            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
     
     mimetype: application/x-microsoft.net.object.soap.base64
@@ -60,6 +60,7 @@
             : and then encoded with base64 encoding.
     -->
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
       <xsd:complexType>
         <xsd:choice maxOccurs="unbounded">
@@ -68,9 +69,10 @@
               <xsd:sequence>
                 <xsd:element name="value" type="xsd:string" minOccurs="0" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="name" use="required" type="xsd:string" />
               <xsd:attribute name="type" type="xsd:string" />
               <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="assembly">
@@ -85,9 +87,10 @@
                 <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
                 <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
               <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
               <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="resheader">
@@ -109,9 +112,13 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="gamestateConfigFileCsGo" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\gamestateConfigFileCsGo.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Artemis/Artemis/Resources/gamestateConfigFileCsGo.txt b/Artemis/Artemis/Resources/gamestateConfigFileCsGo.txt
new file mode 100644
index 000000000..b2366a29c
--- /dev/null
+++ b/Artemis/Artemis/Resources/gamestateConfigFileCsGo.txt
@@ -0,0 +1,18 @@
+"Artemis"
+{
+ "uri" "127.0.0.1:{{port}}/csgo_game_event"
+ "timeout" "5.0"
+ "buffer"  "0.1"
+ "throttle" "0.1"
+ "heartbeat" "30.0"
+ "data"
+ {
+   "provider"            "1"
+   "map"                 "1"
+   "round"               "1"
+   "player_id"           "1"
+   "player_state"        "1"
+   "player_weapons"      "1"
+   "player_match_stats"  "1"
+ }
+}
\ No newline at end of file