diff --git a/lime.png b/lime.png
deleted file mode 100644
index 5afb8060b..000000000
Binary files a/lime.png and /dev/null differ
diff --git a/lime/Assets.hx b/lime/Assets.hx
index 6b5584d10..37bf277b8 100644
--- a/lime/Assets.hx
+++ b/lime/Assets.hx
@@ -3,8 +3,8 @@ package lime;
 
 
 import haxe.Unserializer;
-import lime.graphics.Image;
 import lime.graphics.Font;
+import lime.media.Image;
 import lime.utils.ByteArray;
 
 
diff --git a/lime/audio/Sound.hx b/lime/audio/Sound.hx
deleted file mode 100644
index 706f4e39e..000000000
--- a/lime/audio/Sound.hx
+++ /dev/null
@@ -1,72 +0,0 @@
-package lime.audio;
-
-
-import lime.system.System;
-import lime.utils.ByteArray;
-
-
-class Sound {
-	
-	
-	public var bitsPerSample:Int;
-	public var channels:Int;
-	public var data:ByteArray;
-	public var sampleRate:Int;
-	
-	
-	public function new () {
-		
-		
-		
-	}
-	
-	
-	public static function loadFromBytes (bytes:ByteArray):Sound {
-		
-		#if (cpp || neko)
-		
-		var data = lime_sound_load_bytes (bytes);
-		var sound = new Sound ();
-		sound.bitsPerSample = data.bitsPerSample;
-		sound.channels = data.channels;
-		sound.data = data.data;
-		sound.sampleRate = data.sampleRate;
-		return sound;
-		
-		#else
-		
-		return null;
-		
-		#end
-		
-	}
-	
-	
-	public static function loadFromFile (path:String):Sound {
-		
-		#if (cpp || neko)
-		
-		var data = lime_sound_load (path);
-		var sound = new Sound ();
-		sound.bitsPerSample = data.bitsPerSample;
-		sound.channels = data.channels;
-		sound.data = data.data;
-		sound.sampleRate = data.sampleRate;
-		return sound;
-		
-		#else
-		
-		return null;
-		
-		#end
-		
-	}
-	
-	
-	#if (cpp || neko)
-	private static var lime_sound_load = System.load ("lime", "lime_sound_load", 1);
-	private static var lime_sound_load_bytes = System.load ("lime", "lime_sound_load_bytes", 1);
-	#end
-	
-	
-}
\ No newline at end of file
diff --git a/lime/graphics/Font.hx b/lime/graphics/Font.hx
index b33c65360..97a3912a4 100644
--- a/lime/graphics/Font.hx
+++ b/lime/graphics/Font.hx
@@ -1,6 +1,7 @@
 package lime.graphics;
 
 import haxe.ds.StringMap;
+import lime.media.Image;
 import lime.utils.UInt8Array;
 import lime.system.System;
 #if js
@@ -133,7 +134,7 @@ class Font {
 		image.src = __canvas.toDataURL();
 		return {
 			glyphs: glyphRects,
-			image: new lime.graphics.Image (image, __canvas.width, __canvas.height)
+			image: new lime.media.Image (image, __canvas.width, __canvas.height)
 		}
 
 		#elseif flash
diff --git a/lime/graphics/GLRenderContext.hx b/lime/graphics/GLRenderContext.hx
index a926824ae..9c4327610 100644
--- a/lime/graphics/GLRenderContext.hx
+++ b/lime/graphics/GLRenderContext.hx
@@ -1,7 +1,7 @@
 package lime.graphics; #if !js
 
 
-import lime.graphics.*;
+import lime.graphics.opengl.*;
 import lime.utils.ArrayBuffer;
 import lime.utils.ArrayBufferView;
 import lime.utils.Float32Array;
@@ -1334,16 +1334,16 @@ class GLRenderContext {
 #else
 
 
-import lime.graphics.GLActiveInfo;
-import lime.graphics.GLBuffer;
-import lime.graphics.GLContextAttributes;
-import lime.graphics.GLFramebuffer;
-import lime.graphics.GLProgram;
-import lime.graphics.GLRenderbuffer;
-import lime.graphics.GLShader;
-import lime.graphics.GLShaderPrecisionFormat;
-import lime.graphics.GLTexture;
-import lime.graphics.GLUniformLocation;
+import lime.graphics.opengl.GLActiveInfo;
+import lime.graphics.opengl.GLBuffer;
+import lime.graphics.opengl.GLContextAttributes;
+import lime.graphics.opengl.GLFramebuffer;
+import lime.graphics.opengl.GLProgram;
+import lime.graphics.opengl.GLRenderbuffer;
+import lime.graphics.opengl.GLShader;
+import lime.graphics.opengl.GLShaderPrecisionFormat;
+import lime.graphics.opengl.GLTexture;
+import lime.graphics.opengl.GLUniformLocation;
 
 
 @:native("WebGLRenderingContext")
diff --git a/lime/graphics/JPG.hx b/lime/graphics/JPG.hx
deleted file mode 100644
index 7ab713a41..000000000
--- a/lime/graphics/JPG.hx
+++ /dev/null
@@ -1,42 +0,0 @@
-package lime.graphics;
-
-
-import lime.utils.ByteArray;
-
-
-class JPG {
-	
-	
-	public static function encode (image:Image):ByteArray {
-		
-		return null;
-		
-	}
-	
-	
-	public static function decode (bytes:ByteArray):Image {
-		
-		return null;
-		
-	}
-	
-	
-	public static function isFormat (bytes:ByteArray):Bool {
-		
-		if (bytes != null) {
-			
-			var cachePosition = bytes.position;
-			bytes.position = 0;
-			var result = (bytes.readByte () == 0xFF && bytes.readByte () == 0xD8);
-			bytes.position = cachePosition;
-			
-			return result;
-			
-		}
-		
-		return false;
-		
-	}
-	
-	
-}
\ No newline at end of file
diff --git a/lime/graphics/PNG.hx b/lime/graphics/PNG.hx
deleted file mode 100644
index 5d892fe5b..000000000
--- a/lime/graphics/PNG.hx
+++ /dev/null
@@ -1,42 +0,0 @@
-package lime.graphics;
-
-
-import lime.utils.ByteArray;
-
-
-class PNG {
-	
-	
-	public static function encode (image:Image):ByteArray {
-		
-		return null;
-		
-	}
-	
-	
-	public static function decode (bytes:ByteArray):Image {
-		
-		return null;
-		
-	}
-	
-	
-	public static function isFormat (bytes:ByteArray):Bool {
-		
-		if (bytes != null) {
-			
-			var cachePosition = bytes.position;
-			bytes.position = 0;
-			var result = (bytes.readByte () == 0x89 && bytes.readByte () == 0x50 && bytes.readByte () == 0x4E && bytes.readByte () == 0x47 && bytes.readByte () == 0x0D && bytes.readByte () == 0x0A && bytes.readByte () == 0x1A && bytes.readByte () == 0x0A);
-			bytes.position = cachePosition;
-			
-			return result;
-			
-		}
-		
-		return false;
-		
-	}
-	
-	
-}
\ No newline at end of file
diff --git a/lime/graphics/Renderer.hx b/lime/graphics/Renderer.hx
index 917089135..d87398a53 100644
--- a/lime/graphics/Renderer.hx
+++ b/lime/graphics/Renderer.hx
@@ -3,7 +3,7 @@ package lime.graphics;
 
 import lime.app.Application;
 import lime.app.Event;
-import lime.graphics.GL;
+import lime.graphics.opengl.GL;
 import lime.graphics.GLRenderContext;
 import lime.system.System;
 import lime.ui.Window;
@@ -15,7 +15,7 @@ import flash.Lib;
 #end
 
 
-@:access(lime.graphics.GL)
+@:access(lime.graphics.opengl.GL)
 @:access(lime.app.Application)
 @:allow(lime.app.Application)
 
diff --git a/lime/graphics/GL.hx b/lime/graphics/opengl/GL.hx
similarity index 99%
rename from lime/graphics/GL.hx
rename to lime/graphics/opengl/GL.hx
index 7b0fb1678..be72a3135 100644
--- a/lime/graphics/GL.hx
+++ b/lime/graphics/opengl/GL.hx
@@ -1,4 +1,4 @@
-package lime.graphics;
+package lime.graphics.opengl;
 
 
 import lime.utils.ArrayBuffer;
diff --git a/lime/graphics/GLActiveInfo.hx b/lime/graphics/opengl/GLActiveInfo.hx
similarity index 74%
rename from lime/graphics/GLActiveInfo.hx
rename to lime/graphics/opengl/GLActiveInfo.hx
index 07ee4eaa1..eef699ca0 100644
--- a/lime/graphics/GLActiveInfo.hx
+++ b/lime/graphics/opengl/GLActiveInfo.hx
@@ -1,7 +1,4 @@
-package lime.graphics;
-#if js
-typedef GLActiveInfo = js.html.webgl.ActiveInfo;
-#else
+package lime.graphics.opengl; #if !js
 
 
 typedef GLActiveInfo = {
@@ -13,4 +10,6 @@ typedef GLActiveInfo = {
 }
 
 
+#else
+typedef GLActiveInfo = js.html.webgl.ActiveInfo;
 #end
\ No newline at end of file
diff --git a/lime/graphics/GLBuffer.hx b/lime/graphics/opengl/GLBuffer.hx
similarity index 80%
rename from lime/graphics/GLBuffer.hx
rename to lime/graphics/opengl/GLBuffer.hx
index b2b648731..b83f23bfe 100644
--- a/lime/graphics/GLBuffer.hx
+++ b/lime/graphics/opengl/GLBuffer.hx
@@ -1,7 +1,4 @@
-package lime.graphics;
-#if js
-typedef GLBuffer = js.html.webgl.Buffer;
-#else
+package lime.graphics.opengl; #if !js
 
 
 class GLBuffer extends GLObject {
@@ -17,4 +14,6 @@ class GLBuffer extends GLObject {
 }
 
 
+#else
+typedef GLBuffer = js.html.webgl.Buffer;
 #end
\ No newline at end of file
diff --git a/lime/graphics/GLContextAttributes.hx b/lime/graphics/opengl/GLContextAttributes.hx
similarity index 84%
rename from lime/graphics/GLContextAttributes.hx
rename to lime/graphics/opengl/GLContextAttributes.hx
index c80237b25..bdb9cbf0b 100644
--- a/lime/graphics/GLContextAttributes.hx
+++ b/lime/graphics/opengl/GLContextAttributes.hx
@@ -1,7 +1,4 @@
-package lime.graphics;
-#if js
-typedef GLContextAttributes = js.html.webgl.ContextAttributes;
-#else
+package lime.graphics.opengl; #if !js
 
 
 typedef GLContextAttributes = {
@@ -16,4 +13,6 @@ typedef GLContextAttributes = {
 }
 
 
+#else
+typedef GLContextAttributes = js.html.webgl.ContextAttributes;
 #end
\ No newline at end of file
diff --git a/lime/graphics/GLFramebuffer.hx b/lime/graphics/opengl/GLFramebuffer.hx
similarity index 81%
rename from lime/graphics/GLFramebuffer.hx
rename to lime/graphics/opengl/GLFramebuffer.hx
index 5cbeb2a6b..847df1870 100644
--- a/lime/graphics/GLFramebuffer.hx
+++ b/lime/graphics/opengl/GLFramebuffer.hx
@@ -1,7 +1,4 @@
-package lime.graphics;
-#if js
-typedef GLFramebuffer = js.html.webgl.Framebuffer;
-#else
+package lime.graphics.opengl; #if !js
 
 
 class GLFramebuffer extends GLObject {
@@ -17,4 +14,6 @@ class GLFramebuffer extends GLObject {
 }
 
 
+#else
+typedef GLFramebuffer = js.html.webgl.Framebuffer;
 #end
\ No newline at end of file
diff --git a/lime/graphics/GLObject.hx b/lime/graphics/opengl/GLObject.hx
similarity index 97%
rename from lime/graphics/GLObject.hx
rename to lime/graphics/opengl/GLObject.hx
index 0ec5d1b6b..c25c7088a 100644
--- a/lime/graphics/GLObject.hx
+++ b/lime/graphics/opengl/GLObject.hx
@@ -1,4 +1,4 @@
-package lime.graphics;
+package lime.graphics.opengl;
 
 
 class GLObject {
diff --git a/lime/graphics/GLProgram.hx b/lime/graphics/opengl/GLProgram.hx
similarity index 92%
rename from lime/graphics/GLProgram.hx
rename to lime/graphics/opengl/GLProgram.hx
index 4186e3d3c..ad31f7cad 100644
--- a/lime/graphics/GLProgram.hx
+++ b/lime/graphics/opengl/GLProgram.hx
@@ -1,7 +1,4 @@
-package lime.graphics;
-#if js
-typedef GLProgram = js.html.webgl.Program;
-#else
+package lime.graphics.opengl; #if !js
 
 
 class GLProgram extends GLObject {
@@ -42,4 +39,6 @@ class GLProgram extends GLObject {
 }
 
 
+#else
+typedef GLProgram = js.html.webgl.Program;
 #end
\ No newline at end of file
diff --git a/lime/graphics/GLRenderbuffer.hx b/lime/graphics/opengl/GLRenderbuffer.hx
similarity index 82%
rename from lime/graphics/GLRenderbuffer.hx
rename to lime/graphics/opengl/GLRenderbuffer.hx
index 31eccb4e3..1d68682e0 100644
--- a/lime/graphics/GLRenderbuffer.hx
+++ b/lime/graphics/opengl/GLRenderbuffer.hx
@@ -1,7 +1,4 @@
-package lime.graphics;
-#if js
-typedef GLRenderbuffer = js.html.webgl.Renderbuffer;
-#else
+package lime.graphics.opengl; #if !js
 
 
 class GLRenderbuffer extends GLObject {
@@ -17,4 +14,6 @@ class GLRenderbuffer extends GLObject {
 }
 
 
+#else
+typedef GLRenderbuffer = js.html.webgl.Renderbuffer;
 #end
\ No newline at end of file
diff --git a/lime/graphics/GLShader.hx b/lime/graphics/opengl/GLShader.hx
similarity index 80%
rename from lime/graphics/GLShader.hx
rename to lime/graphics/opengl/GLShader.hx
index 39cf423bd..9837adfe3 100644
--- a/lime/graphics/GLShader.hx
+++ b/lime/graphics/opengl/GLShader.hx
@@ -1,7 +1,4 @@
-package lime.graphics;
-#if js
-typedef GLShader = js.html.webgl.Shader;
-#else
+package lime.graphics.opengl; #if !js
 
 
 class GLShader extends GLObject {
@@ -17,4 +14,6 @@ class GLShader extends GLObject {
 }
 
 
+#else
+typedef GLShader = js.html.webgl.Shader;
 #end
\ No newline at end of file
diff --git a/lime/graphics/GLShaderPrecisionFormat.hx b/lime/graphics/opengl/GLShaderPrecisionFormat.hx
similarity index 80%
rename from lime/graphics/GLShaderPrecisionFormat.hx
rename to lime/graphics/opengl/GLShaderPrecisionFormat.hx
index 1eaeee949..8c2636595 100644
--- a/lime/graphics/GLShaderPrecisionFormat.hx
+++ b/lime/graphics/opengl/GLShaderPrecisionFormat.hx
@@ -1,7 +1,4 @@
-package lime.graphics;
-#if js
-typedef GLShaderPrecisionFormat = js.html.webgl.ShaderPrecisionFormat;
-#else
+package lime.graphics.opengl; #if !js
 
 
 typedef GLShaderPrecisionFormat = {
@@ -13,4 +10,6 @@ typedef GLShaderPrecisionFormat = {
 };
 
 
+#else
+typedef GLShaderPrecisionFormat = js.html.webgl.ShaderPrecisionFormat;
 #end
\ No newline at end of file
diff --git a/lime/graphics/GLTexture.hx b/lime/graphics/opengl/GLTexture.hx
similarity index 81%
rename from lime/graphics/GLTexture.hx
rename to lime/graphics/opengl/GLTexture.hx
index e1d2d3077..91bf6c526 100644
--- a/lime/graphics/GLTexture.hx
+++ b/lime/graphics/opengl/GLTexture.hx
@@ -1,7 +1,4 @@
-package lime.graphics;
-#if js
-typedef GLTexture = js.html.webgl.Texture;
-#else
+package lime.graphics.opengl; #if !js
 
 
 class GLTexture extends GLObject {
@@ -17,4 +14,6 @@ class GLTexture extends GLObject {
 }
 
 
+#else
+typedef GLTexture = js.html.webgl.Texture;
 #end
\ No newline at end of file
diff --git a/lime/graphics/GLUniformLocation.hx b/lime/graphics/opengl/GLUniformLocation.hx
similarity index 70%
rename from lime/graphics/GLUniformLocation.hx
rename to lime/graphics/opengl/GLUniformLocation.hx
index 5587672d2..4b2c7875e 100644
--- a/lime/graphics/GLUniformLocation.hx
+++ b/lime/graphics/opengl/GLUniformLocation.hx
@@ -1,10 +1,9 @@
-package lime.graphics;
-#if js
-typedef GLUniformLocation = js.html.webgl.UniformLocation;
-#else
+package lime.graphics.opengl; #if !js
 
 
 typedef GLUniformLocation = Int;
 
 
+#else
+typedef GLUniformLocation = js.html.webgl.UniformLocation;
 #end
\ No newline at end of file
diff --git a/lime/media/AudioBuffer.hx b/lime/media/AudioBuffer.hx
new file mode 100644
index 000000000..f0b067d1b
--- /dev/null
+++ b/lime/media/AudioBuffer.hx
@@ -0,0 +1,71 @@
+package lime.media;
+
+
+import lime.system.System;
+import lime.utils.ByteArray;
+
+
+class AudioBuffer {
+	
+	
+	public var bitsPerSample:Int;
+	public var channels:Int;
+	public var data:ByteArray;
+	public var sampleRate:Int;
+	
+	
+	public function new () {
+		
+		
+		
+	}
+	
+	
+	public static function fromBytes (bytes:ByteArray):AudioBuffer {
+		
+		#if (cpp || neko)
+		
+		var data = lime_audio_load (bytes);
+		var audioBuffer = new AudioBuffer ();
+		audioBuffer.bitsPerSample = data.bitsPerSample;
+		audioBuffer.channels = data.channels;
+		audioBuffer.data = data.data;
+		audioBuffer.sampleRate = data.sampleRate;
+		return audioBuffer;
+		
+		#else
+		
+		return null;
+		
+		#end
+		
+	}
+	
+	
+	public static function fromFile (path:String):AudioBuffer {
+		
+		#if (cpp || neko)
+		
+		var data = lime_audio_load (path);
+		var audioBuffer = new AudioBuffer ();
+		audioBuffer.bitsPerSample = data.bitsPerSample;
+		audioBuffer.channels = data.channels;
+		audioBuffer.data = data.data;
+		audioBuffer.sampleRate = data.sampleRate;
+		return audioBuffer;
+		
+		#else
+		
+		return null;
+		
+		#end
+		
+	}
+	
+	
+	#if (cpp || neko)
+	private static var lime_audio_load:Dynamic = System.load ("lime", "lime_audio_load", 1);
+	#end
+	
+	
+}
\ No newline at end of file
diff --git a/lime/graphics/Image.hx b/lime/media/Image.hx
similarity index 77%
rename from lime/graphics/Image.hx
rename to lime/media/Image.hx
index 7df5d1aa1..d866d7a87 100644
--- a/lime/graphics/Image.hx
+++ b/lime/media/Image.hx
@@ -1,4 +1,4 @@
-package lime.graphics;
+package lime.media;
 
 
 import lime.utils.ByteArray;
@@ -23,7 +23,7 @@ class Image {
 	#end
 	
 	public var bpp:Int;
-	public var data (get, set):ImageData;
+	public var data (get, set):ImageBuffer;
 	public var height:Int;
 	public var offsetX:Int;
 	public var offsetY:Int;
@@ -34,7 +34,7 @@ class Image {
 	public var textureWidth:Int;
 	public var width:Int;
 	
-	private var __data:ImageData;
+	private var __data:ImageBuffer;
 	
 	
 	public function new (src:ImageSource = null, width:Int = 0, height:Int = 0, bpp:Int = 4) {
@@ -85,7 +85,7 @@ class Image {
 		__context.drawImage (src, 0, 0, width, height);
 		
 		var pixels = __context.getImageData (0, 0, textureWidth, textureHeight);
-		__data = new ImageData (pixels.data);
+		__data = new ImageBuffer (pixels.data);
 		
 		#elseif flash
 		
@@ -93,11 +93,11 @@ class Image {
 		bitmapData.draw (src, null, null, null, true);
 		
 		var pixels = bitmapData.getPixels (bitmapData.rect);
-		__data = new ImageData (pixels);
+		__data = new ImageBuffer (pixels);
 		
 		#else
 		
-		var newData = new ImageData (textureWidth * textureHeight * 4);
+		var newData = new ImageBuffer (textureWidth * textureHeight * 4);
 		
 		for (y in 0...height) {
 			
@@ -116,12 +116,12 @@ class Image {
 	}
 	
 	
-	public static function loadFromBytes (bytes:ByteArray):Image {
+	public static function fromBytes (bytes:ByteArray):Image {
 		
 		#if (cpp || neko)
 		
-		var imageData = lime_image_load_bytes (bytes);
-		return (imageData == null ? null : new Image (new UInt8Array (imageData.data), imageData.width, imageData.height, imageData.bpp));
+		var imageData = lime_image_load (bytes);
+		return (imageData == null ? null : new Image (new ImageBuffer (imageData.data), imageData.width, imageData.height, imageData.bpp));
 		
 		#else
 		
@@ -132,12 +132,12 @@ class Image {
 	}
 	
 	
-	public static function loadFromFile (path:String) {
+	public static function fromFile (path:String) {
 		
 		#if (cpp || neko)
 		
 		var imageData = lime_image_load (path);
-		return (imageData == null ? null : new Image (new UInt8Array (imageData.data), imageData.width, imageData.height, imageData.bpp));
+		return (imageData == null ? null : new Image (new ImageBuffer (imageData.data), imageData.width, imageData.height, imageData.bpp));
 		
 		#else
 		
@@ -160,7 +160,7 @@ class Image {
 	}
 	
 	
-	private function get_data ():ImageData {
+	private function get_data ():ImageBuffer {
 		
 		if (__data == null && src != null && width > 0 && height > 0) {
 			
@@ -178,12 +178,12 @@ class Image {
 			__context.drawImage (src, 0, 0);
 			
 			var pixels = __context.getImageData (0, 0, width, height);
-			__data = new ImageData (pixels.data);
+			__data = new ImageBuffer (pixels.data);
 			
 			#elseif flash
 			
 			var pixels = src.getPixels (src.rect);
-			__data = new ImageData (pixels);
+			__data = new ImageBuffer (pixels);
 			
 			#end
 			
@@ -194,7 +194,7 @@ class Image {
 	}
 	
 	
-	private function set_data (value:ImageData):ImageData {
+	private function set_data (value:ImageBuffer):ImageBuffer {
 		
 		return __data = value;
 		
@@ -209,8 +209,7 @@ class Image {
 	
 	
 	#if (cpp || neko)
-	private static var lime_image_load = System.load ("lime", "lime_image_load", 1);
-	private static var lime_image_load_bytes = System.load ("lime", "lime_image_load_bytes", 1);
+	private static var lime_image_load:Dynamic = System.load ("lime", "lime_image_load", 1);
 	#end
 	
 	
diff --git a/lime/graphics/ImageData.hx b/lime/media/ImageBuffer.hx
similarity index 93%
rename from lime/graphics/ImageData.hx
rename to lime/media/ImageBuffer.hx
index 7cf709332..df6100239 100644
--- a/lime/graphics/ImageData.hx
+++ b/lime/media/ImageBuffer.hx
@@ -1,10 +1,10 @@
-package lime.graphics;
+package lime.media;
 
 
 import lime.utils.UInt8Array;
 
 
-abstract ImageData(UInt8Array) from UInt8Array to UInt8Array {
+abstract ImageBuffer(UInt8Array) from UInt8Array to UInt8Array {
 	
 	
 	public var length (get, never):Int;
diff --git a/lime/audio/AL.hx b/lime/media/openal/AL.hx
similarity index 99%
rename from lime/audio/AL.hx
rename to lime/media/openal/AL.hx
index aae6d9fb8..42f7d57be 100644
--- a/lime/audio/AL.hx
+++ b/lime/media/openal/AL.hx
@@ -1,4 +1,4 @@
-package lime.audio;
+package lime.media.openal;
 
 
 import lime.system.System;
diff --git a/lime/audio/ALC.hx b/lime/media/openal/ALC.hx
similarity index 99%
rename from lime/audio/ALC.hx
rename to lime/media/openal/ALC.hx
index d2770eb3e..ac7e3d3e6 100644
--- a/lime/audio/ALC.hx
+++ b/lime/media/openal/ALC.hx
@@ -1,4 +1,4 @@
-package lime.audio;
+package lime.media.openal;
 
 
 import lime.system.System;
diff --git a/lime/audio/ALContext.hx b/lime/media/openal/ALContext.hx
similarity index 61%
rename from lime/audio/ALContext.hx
rename to lime/media/openal/ALContext.hx
index 6ce3f0939..89c70008f 100644
--- a/lime/audio/ALContext.hx
+++ b/lime/media/openal/ALContext.hx
@@ -1,8 +1,8 @@
-package lime.audio;
+package lime.media.openal;
 
 
-@:allow(lime.audio.AL)
-@:allow(lime.audio.ALC)
+@:allow(lime.media.openal.AL)
+@:allow(lime.media.openal.ALC)
 
 
 abstract ALContext(Null<Float>) from Null<Float> to Null<Float> {
diff --git a/lime/audio/ALDevice.hx b/lime/media/openal/ALDevice.hx
similarity index 61%
rename from lime/audio/ALDevice.hx
rename to lime/media/openal/ALDevice.hx
index a0f4336e6..12095e464 100644
--- a/lime/audio/ALDevice.hx
+++ b/lime/media/openal/ALDevice.hx
@@ -1,8 +1,8 @@
-package lime.audio;
+package lime.media.openal;
 
 
-@:allow(lime.audio.AL)
-@:allow(lime.audio.ALC)
+@:allow(lime.media.openal.AL)
+@:allow(lime.media.openal.ALC)
 
 
 abstract ALDevice(Null<Float>) from Null<Float> to Null<Float> {
diff --git a/lime/utils/GLUtils.hx b/lime/utils/GLUtils.hx
index 8d19e7800..5585398d4 100644
--- a/lime/utils/GLUtils.hx
+++ b/lime/utils/GLUtils.hx
@@ -1,9 +1,9 @@
 package lime.utils;
 
 
-import lime.graphics.GLProgram;
-import lime.graphics.GLShader;
-import lime.graphics.GL;
+import lime.graphics.opengl.GLProgram;
+import lime.graphics.opengl.GLShader;
+import lime.graphics.opengl.GL;
 
 
 class GLUtils {
diff --git a/lime/geom/Matrix3.hx b/lime/utils/Matrix3.hx
similarity index 99%
rename from lime/geom/Matrix3.hx
rename to lime/utils/Matrix3.hx
index 480aebcbe..ff5d8c1b7 100644
--- a/lime/geom/Matrix3.hx
+++ b/lime/utils/Matrix3.hx
@@ -1,7 +1,7 @@
-package lime.geom;
+package lime.utils;
 
 
-import lime.geom.Vector2;
+import lime.utils.Vector2;
 
 
 class Matrix3 {
diff --git a/lime/geom/Matrix4.hx b/lime/utils/Matrix4.hx
similarity index 99%
rename from lime/geom/Matrix4.hx
rename to lime/utils/Matrix4.hx
index 05f17d467..902cd2a30 100644
--- a/lime/geom/Matrix4.hx
+++ b/lime/utils/Matrix4.hx
@@ -1,4 +1,4 @@
-package lime.geom;
+package lime.utils;
 
 
 import lime.utils.Float32Array;
diff --git a/lime/geom/Vector2.hx b/lime/utils/Vector2.hx
similarity index 98%
rename from lime/geom/Vector2.hx
rename to lime/utils/Vector2.hx
index 68b9ee5c9..34598b373 100644
--- a/lime/geom/Vector2.hx
+++ b/lime/utils/Vector2.hx
@@ -1,4 +1,4 @@
-package lime.geom;
+package lime.utils;
 
 
 class Vector2 {
diff --git a/lime/geom/Vector4.hx b/lime/utils/Vector4.hx
similarity index 99%
rename from lime/geom/Vector4.hx
rename to lime/utils/Vector4.hx
index 7d3e33ae9..6e9edf47f 100644
--- a/lime/geom/Vector4.hx
+++ b/lime/utils/Vector4.hx
@@ -1,4 +1,4 @@
-package lime.geom;
+package lime.utils;
 
 
 class Vector4 {
diff --git a/project/Build.xml b/project/Build.xml
index 587032dc9..ea318194a 100644
--- a/project/Build.xml
+++ b/project/Build.xml
@@ -37,7 +37,7 @@
 			<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/jpeg/" />
 			<compilerflag value="-DLIME_JPEG" />
 			
-			<file name="src/format/JPEG.cpp" />
+			<file name="src/media/format/JPEG.cpp" />
 			
 		</section>
 		
@@ -65,7 +65,7 @@
 			<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/vorbis/include/" />
 			<compilerflag value="-DLIME_OGG" />
 			
-			<file name="src/format/OGG.cpp" />
+			<file name="src/media/format/OGG.cpp" />
 			
 		</section>
 		
@@ -75,7 +75,7 @@
 			<compilerflag value="-DLIME_OPENAL" />
 			<compilerflag value="-DAL_LIBTYPE_STATIC=1" />
 			
-			<file name="src/audio/OpenALBindings.cpp" />
+			<file name="src/media/openal/OpenALBindings.cpp" />
 			
 		</section>
 		
@@ -83,7 +83,7 @@
 			
 			<compilerflag value="-DLIME_OPENGL" />
 			
-			<file name="src/graphics/OpenGLBindings.cpp" />
+			<file name="src/graphics/opengl/OpenGLBindings.cpp" />
 			
 		</section>
 		
@@ -93,7 +93,7 @@
 			<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/zlib/" />
 			<compilerflag value="-DLIME_PNG" />
 			
-			<file name="src/format/PNG.cpp" />
+			<file name="src/media/format/PNG.cpp" />
 			
 		</section>
 		
@@ -115,10 +115,10 @@
 		<file name="src/system/ios/System.mm" if="ios" />
 		
 		<file name="src/app/UpdateEvent.cpp" />
-		<file name="src/audio/Sound.cpp" />
-		<file name="src/format/WAV.cpp" />
-		<file name="src/graphics/Image.cpp" />
 		<file name="src/graphics/RenderEvent.cpp" />
+		<file name="src/media/format/WAV.cpp" />
+		<file name="src/media/AudioBuffer.cpp" />
+		<file name="src/media/Image.cpp" />
 		<file name="src/system/System.cpp" />
 		<file name="src/ui/KeyEvent.cpp" />
 		<file name="src/ui/MouseEvent.cpp" />
diff --git a/project/include/format/OGG.h b/project/include/format/OGG.h
deleted file mode 100644
index 11d5e975a..000000000
--- a/project/include/format/OGG.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef LIME_FORMAT_OGG_H
-#define LIME_FORMAT_OGG_H
-
-
-#include <audio/Sound.h>
-#include <utils/Resource.h>
-
-
-namespace lime {
-	
-	
-	class OGG {
-		
-		
-		public:
-			
-			static bool Decode (Resource *resource, Sound *sound);
-		
-		
-	};
-	
-	
-}
-
-
-#endif
\ No newline at end of file
diff --git a/project/include/graphics/Font.h b/project/include/graphics/Font.h
index b564dc71d..0f267c559 100644
--- a/project/include/graphics/Font.h
+++ b/project/include/graphics/Font.h
@@ -4,7 +4,7 @@
 
 #include <hx/CFFI.h>
 #include <list>
-#include <graphics/Image.h>
+#include <media/Image.h>
 #include <ft2build.h>
 #include FT_FREETYPE_H
 
diff --git a/project/include/audio/Sound.h b/project/include/media/AudioBuffer.h
similarity index 83%
rename from project/include/audio/Sound.h
rename to project/include/media/AudioBuffer.h
index be6a37700..e332a1933 100644
--- a/project/include/audio/Sound.h
+++ b/project/include/media/AudioBuffer.h
@@ -1,5 +1,5 @@
-#ifndef LIME_AUDIO_SOUND_H
-#define LIME_AUDIO_SOUND_H
+#ifndef LIME_MEDIA_AUDIO_BUFFER_H
+#define LIME_MEDIA_AUDIO_BUFFER_H
 
 
 #include <hx/CFFI.h>
@@ -29,13 +29,13 @@
 namespace lime {
 	
 	
-	class Sound {
+	class AudioBuffer {
 		
 		
 		public:
 			
-			Sound ();
-			~Sound ();
+			AudioBuffer ();
+			~AudioBuffer ();
 			
 			value Value ();
 			
diff --git a/project/include/graphics/Image.h b/project/include/media/Image.h
similarity index 86%
rename from project/include/graphics/Image.h
rename to project/include/media/Image.h
index 9b184aa8f..f429ca9a5 100644
--- a/project/include/graphics/Image.h
+++ b/project/include/media/Image.h
@@ -1,5 +1,5 @@
-#ifndef LIME_GRAPHICS_IMAGE_H
-#define LIME_GRAPHICS_IMAGE_H
+#ifndef LIME_MEDIA_IMAGE_H
+#define LIME_MEDIA_IMAGE_H
 
 
 #include <hx/CFFI.h>
diff --git a/project/include/format/JPEG.h b/project/include/media/format/JPEG.h
similarity index 62%
rename from project/include/format/JPEG.h
rename to project/include/media/format/JPEG.h
index 8b2989b4e..8186df6f5 100644
--- a/project/include/format/JPEG.h
+++ b/project/include/media/format/JPEG.h
@@ -1,8 +1,8 @@
-#ifndef LIME_FORMAT_JPEG_H
-#define LIME_FORMAT_JPEG_H
+#ifndef LIME_MEDIA_FORMAT_JPEG_H
+#define LIME_MEDIA_FORMAT_JPEG_H
 
 
-#include <graphics/Image.h>
+#include <media/Image.h>
 #include <utils/Resource.h>
 
 
diff --git a/project/include/media/format/OGG.h b/project/include/media/format/OGG.h
new file mode 100644
index 000000000..a15757136
--- /dev/null
+++ b/project/include/media/format/OGG.h
@@ -0,0 +1,26 @@
+#ifndef LIME_MEDIA_FORMAT_OGG_H
+#define LIME_MEDIA_FORMAT_OGG_H
+
+
+#include <media/AudioBuffer.h>
+#include <utils/Resource.h>
+
+
+namespace lime {
+	
+	
+	class OGG {
+		
+		
+		public:
+			
+			static bool Decode (Resource *resource, AudioBuffer *audioBuffer);
+		
+		
+	};
+	
+	
+}
+
+
+#endif
\ No newline at end of file
diff --git a/project/include/format/PNG.h b/project/include/media/format/PNG.h
similarity index 63%
rename from project/include/format/PNG.h
rename to project/include/media/format/PNG.h
index ef6051af7..5855bb459 100644
--- a/project/include/format/PNG.h
+++ b/project/include/media/format/PNG.h
@@ -1,8 +1,8 @@
-#ifndef LIME_FORMAT_PNG_H
-#define LIME_FORMAT_PNG_H
+#ifndef LIME_MEDIA_FORMAT_PNG_H
+#define LIME_MEDIA_FORMAT_PNG_H
 
 
-#include <graphics/Image.h>
+#include <media/Image.h>
 #include <utils/Resource.h>
 
 
diff --git a/project/include/format/WAV.h b/project/include/media/format/WAV.h
similarity index 78%
rename from project/include/format/WAV.h
rename to project/include/media/format/WAV.h
index 0b1709b0a..285348d5c 100644
--- a/project/include/format/WAV.h
+++ b/project/include/media/format/WAV.h
@@ -1,8 +1,8 @@
-#ifndef LIME_FORMAT_WAV_H
-#define LIME_FORMAT_WAV_H
+#ifndef LIME_MEDIA_FORMAT_WAV_H
+#define LIME_MEDIA_FORMAT_WAV_H
 
 
-#include <audio/Sound.h>
+#include <media/AudioBuffer.h>
 #include <utils/Resource.h>
 
 
@@ -45,7 +45,7 @@ namespace lime {
 		
 		public:
 			
-			static bool Decode (Resource *resource, Sound *sound);
+			static bool Decode (Resource *resource, AudioBuffer *audioBuffer);
 		
 		
 	};
diff --git a/project/include/utils/Resource.h b/project/include/utils/Resource.h
index ef48f3ecb..36dcd0dd1 100644
--- a/project/include/utils/Resource.h
+++ b/project/include/utils/Resource.h
@@ -11,6 +11,7 @@ namespace lime {
 	struct Resource {
 		
 		
+		Resource () : data (NULL), path (NULL) {}
 		Resource (const char* path) : data (NULL), path (path) {}
 		Resource (ByteArray *data) : data (data), path (NULL) {}
 		
diff --git a/project/src/ExternalInterface.cpp b/project/src/ExternalInterface.cpp
index aed83757a..acff65272 100644
--- a/project/src/ExternalInterface.cpp
+++ b/project/src/ExternalInterface.cpp
@@ -10,17 +10,17 @@
 #include <hx/CFFI.h>
 #include <app/Application.h>
 #include <app/UpdateEvent.h>
-#include <audio/Sound.h>
 #ifdef LIME_FREETYPE
 #include <graphics/Font.h>
 #endif
-#include <format/JPEG.h>
-#include <format/OGG.h>
-#include <format/PNG.h>
-#include <format/WAV.h>
-#include <graphics/Image.h>
 #include <graphics/Renderer.h>
 #include <graphics/RenderEvent.h>
+#include <media/format/JPEG.h>
+#include <media/format/OGG.h>
+#include <media/format/PNG.h>
+#include <media/format/WAV.h>
+#include <media/AudioBuffer.h>
+#include <media/Image.h>
 #include <system/System.h>
 #include <ui/KeyEvent.h>
 #include <ui/MouseEvent.h>
@@ -57,23 +57,32 @@ namespace lime {
 	}
 	
 	
-	value lime_image_load (value path) {
+	value lime_audio_load (value data) {
 		
-		Image image;
-		Resource resource (val_string (path));
+		AudioBuffer audioBuffer;
+		Resource resource;
 		
-		#ifdef LIME_PNG
-		if (PNG::Decode (&resource, &image)) {
+		if (val_is_string (data)) {
 			
-			return image.Value ();
+			resource = Resource (val_string (data));
+			
+		} else {
+			
+			ByteArray bytes (data);
+			resource = Resource (&bytes);
 			
 		}
-		#endif
 		
-		#ifdef LIME_JPEG
-		if (JPEG::Decode (&resource, &image)) {
+		if (WAV::Decode (&resource, &audioBuffer)) {
 			
-			return image.Value ();
+			return audioBuffer.Value ();
+			
+		}
+		
+		#ifdef LIME_OGG
+		if (OGG::Decode (&resource, &audioBuffer)) {
+			
+			return audioBuffer.Value ();
 			
 		}
 		#endif
@@ -83,11 +92,21 @@ namespace lime {
 	}
 	
 	
-	value lime_image_load_bytes (value bytes) {
+	value lime_image_load (value data) {
 		
 		Image image;
-		ByteArray data (bytes);
-		Resource resource (&data);
+		Resource resource;
+		
+		if (val_is_string (data)) {
+			
+			resource = Resource (val_string (data));
+			
+		} else {
+			
+			ByteArray bytes (data);
+			resource = Resource (&bytes);
+			
+		}
 		
 		#ifdef LIME_PNG
 		if (PNG::Decode (&resource, &image)) {
@@ -217,55 +236,6 @@ namespace lime {
 	}
 	
 	
-	value lime_sound_load (value path) {
-		
-		Sound sound;
-		Resource resource (val_string (path));
-		
-		if (WAV::Decode (&resource, &sound)) {
-			
-			return sound.Value ();
-			
-		}
-		
-		#ifdef LIME_OGG
-		if (OGG::Decode (&resource, &sound)) {
-			
-			return sound.Value ();
-			
-		}
-		#endif
-		
-		return alloc_null ();
-		
-	}
-	
-	
-	value lime_sound_load_bytes (value bytes) {
-		
-		Sound sound;
-		ByteArray data (bytes);
-		Resource resource (&data);
-		
-		if (WAV::Decode (&resource, &sound)) {
-			
-			return sound.Value ();
-			
-		}
-		
-		#ifdef LIME_OGG
-		if (OGG::Decode (&resource, &sound)) {
-			
-			return sound.Value ();
-			
-		}
-		#endif
-		
-		return alloc_null ();
-		
-	}
-	
-	
 	value lime_system_get_timestamp () {
 		
 		return alloc_float (System::GetTimestamp ());
@@ -329,8 +299,8 @@ namespace lime {
 	DEFINE_PRIM (lime_application_create, 1);
 	DEFINE_PRIM (lime_application_exec, 1);
 	DEFINE_PRIM (lime_application_get_ticks, 0);
+	DEFINE_PRIM (lime_audio_load, 1);
 	DEFINE_PRIM (lime_image_load, 1);
-	DEFINE_PRIM (lime_image_load_bytes, 1);
 	DEFINE_PRIM (lime_font_load, 1);
 	DEFINE_PRIM (lime_font_load_glyphs, 3);
 	DEFINE_PRIM (lime_key_event_manager_register, 2);
@@ -341,8 +311,6 @@ namespace lime {
 	DEFINE_PRIM (lime_renderer_create, 1);
 	DEFINE_PRIM (lime_renderer_flip, 1);
 	DEFINE_PRIM (lime_render_event_manager_register, 2);
-	DEFINE_PRIM (lime_sound_load, 1);
-	DEFINE_PRIM (lime_sound_load_bytes, 1);
 	DEFINE_PRIM (lime_system_get_timestamp, 0);
 	DEFINE_PRIM (lime_touch_event_manager_register, 2);
 	DEFINE_PRIM (lime_update_event_manager_register, 2);
diff --git a/project/src/graphics/OpenGL.h b/project/src/graphics/opengl/OpenGL.h
similarity index 98%
rename from project/src/graphics/OpenGL.h
rename to project/src/graphics/opengl/OpenGL.h
index 94b867c76..9bcb48199 100644
--- a/project/src/graphics/OpenGL.h
+++ b/project/src/graphics/opengl/OpenGL.h
@@ -1,15 +1,15 @@
-#ifndef LIME_GRAPHICS_OPENGL_H
-#define LIME_GRAPHICS_OPENGL_H
+#ifndef LIME_GRAPHICS_OPENGL_OPENGL_H
+#define LIME_GRAPHICS_OPENGL_OPENGL_H
 
 
 #if defined (BLACKBERRY) || defined (ANDROID) || defined (WEBOS) || defined (GPH) || defined (RASPBERRYPI) || defined (EMSCRIPTEN)
-	
+
 #define LIME_GLES
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
-	
+
 #elif defined (TIZEN)
-	
+
 #define LIME_GLES
 #include <gl2.h>
 #include <gl2ext.h>
diff --git a/project/src/graphics/OpenGLBindings.cpp b/project/src/graphics/opengl/OpenGLBindings.cpp
similarity index 100%
rename from project/src/graphics/OpenGLBindings.cpp
rename to project/src/graphics/opengl/OpenGLBindings.cpp
diff --git a/project/src/graphics/OpenGLBindings.h b/project/src/graphics/opengl/OpenGLBindings.h
similarity index 64%
rename from project/src/graphics/OpenGLBindings.h
rename to project/src/graphics/opengl/OpenGLBindings.h
index c963701c8..6e7328454 100644
--- a/project/src/graphics/OpenGLBindings.h
+++ b/project/src/graphics/opengl/OpenGLBindings.h
@@ -1,5 +1,5 @@
-#ifndef LIME_GRAPHICS_OPENGL_BINDINGS_H
-#define LIME_GRAPHICS_OPENGL_BINDINGS_H
+#ifndef LIME_GRAPHICS_OPENGL_OPENGL_BINDINGS_H
+#define LIME_GRAPHICS_OPENGL_OPENGL_BINDINGS_H
 
 
 namespace lime {
diff --git a/project/src/graphics/OpenGLExtensions.h b/project/src/graphics/opengl/OpenGLExtensions.h
similarity index 100%
rename from project/src/graphics/OpenGLExtensions.h
rename to project/src/graphics/opengl/OpenGLExtensions.h
diff --git a/project/src/audio/Sound.cpp b/project/src/media/AudioBuffer.cpp
similarity index 86%
rename from project/src/audio/Sound.cpp
rename to project/src/media/AudioBuffer.cpp
index e379ef658..11fd30e91 100644
--- a/project/src/audio/Sound.cpp
+++ b/project/src/media/AudioBuffer.cpp
@@ -1,4 +1,4 @@
-#include <audio/Sound.h>
+#include <media/AudioBuffer.h>
 
 
 namespace lime {
@@ -11,7 +11,7 @@ namespace lime {
 	static bool init = false;
 	
 	
-	Sound::Sound () {
+	AudioBuffer::AudioBuffer () {
 		
 		bitsPerSample = 0;
 		channels = 0;
@@ -21,14 +21,14 @@ namespace lime {
 	}
 	
 	
-	Sound::~Sound () {
+	AudioBuffer::~AudioBuffer () {
 		
 		delete data;
 		
 	}
 	
 	
-	value Sound::Value () {
+	value AudioBuffer::Value () {
 		
 		if (!init) {
 			
diff --git a/project/src/graphics/Image.cpp b/project/src/media/Image.cpp
similarity index 97%
rename from project/src/graphics/Image.cpp
rename to project/src/media/Image.cpp
index eba56df68..68b4a48d2 100644
--- a/project/src/graphics/Image.cpp
+++ b/project/src/media/Image.cpp
@@ -1,4 +1,4 @@
-#include <graphics/Image.h>
+#include <media/Image.h>
 
 
 namespace lime {
diff --git a/project/src/format/JPEG.cpp b/project/src/media/format/JPEG.cpp
similarity index 99%
rename from project/src/format/JPEG.cpp
rename to project/src/media/format/JPEG.cpp
index 47569358c..db326ab0a 100644
--- a/project/src/format/JPEG.cpp
+++ b/project/src/media/format/JPEG.cpp
@@ -7,7 +7,7 @@ extern "C" {
 }
 
 #include <setjmp.h>
-#include <format/JPEG.h>
+#include <media/format/JPEG.h>
 #include <utils/FileIO.h>
 
 
diff --git a/project/src/format/OGG.cpp b/project/src/media/format/OGG.cpp
similarity index 81%
rename from project/src/format/OGG.cpp
rename to project/src/media/format/OGG.cpp
index 5135e2aab..0c25c2ab7 100644
--- a/project/src/format/OGG.cpp
+++ b/project/src/media/format/OGG.cpp
@@ -1,4 +1,4 @@
-#include <format/OGG.h>
+#include <media/format/OGG.h>
 #include <utils/FileIO.h>
 #include <vorbis/vorbisfile.h>
 
@@ -104,7 +104,7 @@ namespace lime {
 	};
 	
 	
-	bool OGG::Decode (Resource *resource, Sound *sound) {
+	bool OGG::Decode (Resource *resource, AudioBuffer *audioBuffer) {
 		
 		OggVorbis_File oggFile;
 		
@@ -122,7 +122,7 @@ namespace lime {
 			
 			if (!file) {
 				
-				//LOG_SOUND("FAILED to read sound file, file pointer as null?\n");
+				//LOG_SOUND("FAILED to read audio file, file pointer as null?\n");
 				return false;
 				
 			}
@@ -167,30 +167,29 @@ namespace lime {
 			
 		}
 		
-		sound->channels = pInfo->channels;
-		sound->sampleRate = pInfo->rate;
+		audioBuffer->channels = pInfo->channels;
+		audioBuffer->sampleRate = pInfo->rate;
 		
 		//default to 16? todo 
-		sound->bitsPerSample = 16;
+		audioBuffer->bitsPerSample = 16;
 		
 		// Seem to need four times the read PCM total
-		sound->data->Resize (ov_pcm_total (&oggFile, -1) * 4);
+		audioBuffer->data->Resize (ov_pcm_total (&oggFile, -1) * 4);
 		
 		while (bytes > 0) {
 			
-			if (sound->data->Size () < totalBytes + BUFFER_SIZE) {
+			if (audioBuffer->data->Size () < totalBytes + BUFFER_SIZE) {
 				
-				sound->data->Resize (totalBytes + BUFFER_SIZE);
+				audioBuffer->data->Resize (totalBytes + BUFFER_SIZE);
 				
 			}
 			
-			// Read up to a buffer's worth of decoded sound data
-			bytes = ov_read (&oggFile, (char *)sound->data->Bytes () + totalBytes, BUFFER_SIZE, BUFFER_READ_TYPE, 2, 1, &bitStream);
+			bytes = ov_read (&oggFile, (char *)audioBuffer->data->Bytes () + totalBytes, BUFFER_SIZE, BUFFER_READ_TYPE, 2, 1, &bitStream);
 			totalBytes += bytes;
 			
 		}
 		
-		sound->data->Resize (totalBytes);
+		audioBuffer->data->Resize (totalBytes);
 		ov_clear (&oggFile);
 		
 		#undef BUFFER_SIZE
diff --git a/project/src/format/PNG.cpp b/project/src/media/format/PNG.cpp
similarity index 99%
rename from project/src/format/PNG.cpp
rename to project/src/media/format/PNG.cpp
index 883d3be96..b372673d0 100644
--- a/project/src/format/PNG.cpp
+++ b/project/src/media/format/PNG.cpp
@@ -7,7 +7,7 @@ extern "C" {
 }
 
 #include <setjmp.h>
-#include <format/PNG.h>
+#include <media/format/PNG.h>
 #include <utils/FileIO.h>
 #include <utils/QuickVec.h>
 
diff --git a/project/src/format/WAV.cpp b/project/src/media/format/WAV.cpp
similarity index 88%
rename from project/src/format/WAV.cpp
rename to project/src/media/format/WAV.cpp
index 24454d71f..f9bba61fe 100644
--- a/project/src/format/WAV.cpp
+++ b/project/src/media/format/WAV.cpp
@@ -1,4 +1,4 @@
-#include <format/WAV.h>
+#include <media/format/WAV.h>
 #include <utils/FileIO.h>
 
 
@@ -42,7 +42,7 @@ namespace lime {
 	}
 	
 	
-	bool WAV::Decode (Resource *resource, Sound *sound) {
+	bool WAV::Decode (Resource *resource, AudioBuffer *audioBuffer) {
 		
 		WAVE_Format wave_format;
 		RIFF_Header riff_header;
@@ -63,7 +63,7 @@ namespace lime {
 			
 			if (!file) {
 				
-				//LOG_SOUND ("FAILED to read sound file, file pointer as null?\n");
+				//LOG_SOUND ("FAILED to read audio file, file pointer as null?\n");
 				return false;
 				
 			}
@@ -136,9 +136,9 @@ namespace lime {
 				
 			}
 			
-			sound->data->Resize (wave_data.subChunkSize);
+			audioBuffer->data->Resize (wave_data.subChunkSize);
 			
-			if (!lime::fread (sound->data->Bytes (), wave_data.subChunkSize, 1, file)) {
+			if (!lime::fread (audioBuffer->data->Bytes (), wave_data.subChunkSize, 1, file)) {
 				
 				LOG_SOUND ("error loading WAVE data into struct!\n");
 				return false;
@@ -197,7 +197,7 @@ namespace lime {
 				
 			}
 			
-			sound->data->Resize (wave_data.subChunkSize);
+			audioBuffer->data->Resize (wave_data.subChunkSize);
 			
 			size_t size = wave_data.subChunkSize;
 			
@@ -207,14 +207,14 @@ namespace lime {
 				
 			}
 			
-			unsigned char* bytes = sound->data->Bytes ();
+			unsigned char* bytes = audioBuffer->data->Bytes ();
 			memcpy (bytes, base, size);
 			
 		}
 		
-		sound->sampleRate = (int)wave_format.sampleRate;
-		sound->channels = wave_format.numChannels;
-		sound->bitsPerSample = wave_format.bitsPerSample;
+		audioBuffer->sampleRate = (int)wave_format.sampleRate;
+		audioBuffer->channels = wave_format.numChannels;
+		audioBuffer->bitsPerSample = wave_format.bitsPerSample;
 		
 		return true;
 		
diff --git a/project/src/audio/OpenALBindings.cpp b/project/src/media/openal/OpenALBindings.cpp
similarity index 100%
rename from project/src/audio/OpenALBindings.cpp
rename to project/src/media/openal/OpenALBindings.cpp
diff --git a/samples/SimpleImage/Source/Main.hx b/samples/SimpleImage/Source/Main.hx
index e3119547c..68877eb22 100644
--- a/samples/SimpleImage/Source/Main.hx
+++ b/samples/SimpleImage/Source/Main.hx
@@ -2,10 +2,11 @@ package;
 
 
 import lime.app.Application;
-import lime.geom.Matrix4;
-import lime.graphics.*;
+import lime.graphics.opengl.*;
+import lime.graphics.RenderContext;
 import lime.utils.Float32Array;
 import lime.utils.GLUtils;
+import lime.utils.Matrix4;
 import lime.Assets;
 
 
diff --git a/templates/haxe/DefaultAssetLibrary.hx b/templates/haxe/DefaultAssetLibrary.hx
index 934da250f..c72f1b8f9 100644
--- a/templates/haxe/DefaultAssetLibrary.hx
+++ b/templates/haxe/DefaultAssetLibrary.hx
@@ -4,7 +4,7 @@ package;
 import haxe.Timer;
 import haxe.Unserializer;
 import lime.app.Preloader;
-import lime.graphics.Image;
+import lime.media.Image;
 import lime.utils.ByteArray;
 import lime.utils.UInt8Array;
 import lime.Assets;
@@ -216,7 +216,7 @@ class DefaultAssetLibrary extends AssetLibrary {
 		
 		#else
 		
-		return Image.loadFromFile (path.get (id));
+		return Image.fromFile (path.get (id));
 		
 		#end