diff --git a/ClassicalSharp/Audio/AudioManager.cs b/ClassicalSharp/Audio/AudioManager.cs
new file mode 100644
index 000000000..442ad87c7
--- /dev/null
+++ b/ClassicalSharp/Audio/AudioManager.cs
@@ -0,0 +1,38 @@
+using System;
+using OpenTK;
+using SharpWave;
+
+namespace ClassicalSharp.Audio {
+	
+	public sealed class AudioManager {
+		
+		IAudioOutput musicOut, soundOut;
+		public AudioManager( Game game ) {
+			Init( game );
+		}
+		
+		void Init( Game game ) {
+			if( Configuration.RunningOnWindows ) {
+				musicOut = new WinMmOut();			
+				soundOut = new WinMmOut();				
+			} else {
+				musicOut = new OpenALOut();
+				soundOut = new OpenALOut();					
+			}
+			musicOut.Create( 4 );
+			soundOut.Create( 4, musicOut );
+		}
+		
+		double accumulator;
+		Random rnd = new Random();
+		public void Tick( double delta ) {
+			accumulator += delta;
+		}
+		
+		public void Dispose() {
+			// TODO: stop playing current sound and/or music
+			musicOut.Dispose();
+			soundOut.Dispose();
+		}
+	}
+}
diff --git a/ClassicalSharp/ClassicalSharp.csproj b/ClassicalSharp/ClassicalSharp.csproj
index 90cbee10e..5bde9d4bd 100644
--- a/ClassicalSharp/ClassicalSharp.csproj
+++ b/ClassicalSharp/ClassicalSharp.csproj
@@ -124,6 +124,7 @@
     <Compile Include="2D\Widgets\PlayerListWidget.cs" />
     <Compile Include="2D\Widgets\TextWidget.cs" />
     <Compile Include="2D\Widgets\Widget.cs" />
+    <Compile Include="Audio\AudioManager.cs" />
     <Compile Include="Blocks\Block.cs" />
     <Compile Include="Blocks\BlockInfo.BoundingBox.cs" />
     <Compile Include="Blocks\BlockInfo.cs" />
@@ -135,11 +136,11 @@
     <Compile Include="Entities\LocalPlayer.cs" />
     <Compile Include="Entities\LocationUpdate.cs" />
     <Compile Include="Entities\NetPlayer.cs" />
-    <Compile Include="Entities\Particles\CollidableParticle.cs" />
-    <Compile Include="Entities\Particles\Particle.cs" />
-    <Compile Include="Entities\Particles\ParticleManager.cs" />
-    <Compile Include="Entities\Particles\RainParticle.cs" />
-    <Compile Include="Entities\Particles\TerrainParticle.cs" />
+    <Compile Include="Particles\CollidableParticle.cs" />
+    <Compile Include="Particles\Particle.cs" />
+    <Compile Include="Particles\ParticleManager.cs" />
+    <Compile Include="Particles\RainParticle.cs" />
+    <Compile Include="Particles\TerrainParticle.cs" />
     <Compile Include="Entities\PhysicsEntity.cs" />
     <Compile Include="Entities\Player.cs" />
     <Compile Include="Entities\Player.Rendering.cs" />
@@ -258,7 +259,7 @@
     <Folder Include="2D\Widgets\Menu" />
     <Folder Include="2D\Widgets\Chat" />
     <Folder Include="Blocks" />
-    <Folder Include="Entities\Particles" />
+    <Folder Include="Particles" />
     <Folder Include="GraphicsAPI" />
     <Folder Include="Entities" />
     <Folder Include="Ionic.Zlib" />
@@ -268,6 +269,7 @@
     <Folder Include="Model" />
     <Folder Include="Network\Utils" />
     <Folder Include="Hotkeys" />
+    <Folder Include="Audio" />
     <Folder Include="TexturePack" />
     <Folder Include="Singleplayer" />
     <Folder Include="Utils" />
diff --git a/ClassicalSharp/Entities/Particles/CollidableParticle.cs b/ClassicalSharp/Particles/CollidableParticle.cs
similarity index 100%
rename from ClassicalSharp/Entities/Particles/CollidableParticle.cs
rename to ClassicalSharp/Particles/CollidableParticle.cs
diff --git a/ClassicalSharp/Entities/Particles/Particle.cs b/ClassicalSharp/Particles/Particle.cs
similarity index 100%
rename from ClassicalSharp/Entities/Particles/Particle.cs
rename to ClassicalSharp/Particles/Particle.cs
diff --git a/ClassicalSharp/Entities/Particles/ParticleManager.cs b/ClassicalSharp/Particles/ParticleManager.cs
similarity index 100%
rename from ClassicalSharp/Entities/Particles/ParticleManager.cs
rename to ClassicalSharp/Particles/ParticleManager.cs
diff --git a/ClassicalSharp/Entities/Particles/RainParticle.cs b/ClassicalSharp/Particles/RainParticle.cs
similarity index 100%
rename from ClassicalSharp/Entities/Particles/RainParticle.cs
rename to ClassicalSharp/Particles/RainParticle.cs
diff --git a/ClassicalSharp/Entities/Particles/TerrainParticle.cs b/ClassicalSharp/Particles/TerrainParticle.cs
similarity index 100%
rename from ClassicalSharp/Entities/Particles/TerrainParticle.cs
rename to ClassicalSharp/Particles/TerrainParticle.cs