diff --git a/.gitignore b/.gitignore
index fa74fc6..67e9955 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,5 @@
 azure-test
 build
 /doc
+/target
+/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
new file mode 100644
index 0000000..2d72803
--- /dev/null
+++ b/Cargo.toml
@@ -0,0 +1,52 @@
+[package]
+
+name = "azure"
+version = "0.1.0"
+authors = ["The Servo Project Developers"]
+
+build = "make -f makefile.cargo"
+
+[dependencies.geom]
+
+git = "https://github.com/servo/rust-geom"
+
+[dependencies.layers]
+
+git = "https://github.com/servo/rust-layers"
+
+[dependencies.opengles]
+
+git = "https://github.com/servo/rust-opengles"
+
+[dependencies.skia-sys]
+
+git = "https://github.com/servo/skia"
+
+[dependencies.xlib]
+
+git = "https://github.com/servo/rust-xlib"
+
+[dependencies.egl]
+
+git = "https://github.com/servo/rust-egl"
+
+[dependencies.glfw]
+
+git = "https://github.com/servo/glfw-rs"
+branch = "servo"
+
+[dependencies.freetype]
+
+git = "https://github.com/servo/rust-freetype"
+
+[dependencies.core_foundation]
+
+git = "https://github.com/servo/rust-core-foundation"
+
+[dependencies.core_graphics]
+
+git = "https://github.com/servo/rust-core-graphics"
+
+[dependencies.core_text]
+
+git = "https://github.com/servo/rust-core-text"
diff --git a/config/autoconf.mk b/libazure/config/autoconf.mk
similarity index 100%
rename from config/autoconf.mk
rename to libazure/config/autoconf.mk
diff --git a/config/rules.mk b/libazure/config/rules.mk
similarity index 100%
rename from config/rules.mk
rename to libazure/config/rules.mk
diff --git a/include/mozilla/Assertions.h b/libazure/include/mozilla/Assertions.h
similarity index 100%
rename from include/mozilla/Assertions.h
rename to libazure/include/mozilla/Assertions.h
diff --git a/include/mozilla/Attributes.h b/libazure/include/mozilla/Attributes.h
similarity index 100%
rename from include/mozilla/Attributes.h
rename to libazure/include/mozilla/Attributes.h
diff --git a/include/mozilla/CheckedInt.h b/libazure/include/mozilla/CheckedInt.h
similarity index 100%
rename from include/mozilla/CheckedInt.h
rename to libazure/include/mozilla/CheckedInt.h
diff --git a/include/mozilla/Compiler.h b/libazure/include/mozilla/Compiler.h
similarity index 100%
rename from include/mozilla/Compiler.h
rename to libazure/include/mozilla/Compiler.h
diff --git a/include/mozilla/Constants.h b/libazure/include/mozilla/Constants.h
similarity index 100%
rename from include/mozilla/Constants.h
rename to libazure/include/mozilla/Constants.h
diff --git a/include/mozilla/Likely.h b/libazure/include/mozilla/Likely.h
similarity index 100%
rename from include/mozilla/Likely.h
rename to libazure/include/mozilla/Likely.h
diff --git a/include/mozilla/NullPtr.h b/libazure/include/mozilla/NullPtr.h
similarity index 100%
rename from include/mozilla/NullPtr.h
rename to libazure/include/mozilla/NullPtr.h
diff --git a/include/mozilla/RefPtr.h b/libazure/include/mozilla/RefPtr.h
similarity index 100%
rename from include/mozilla/RefPtr.h
rename to libazure/include/mozilla/RefPtr.h
diff --git a/include/mozilla/StandardInteger.h b/libazure/include/mozilla/StandardInteger.h
similarity index 100%
rename from include/mozilla/StandardInteger.h
rename to libazure/include/mozilla/StandardInteger.h
diff --git a/include/mozilla/TypedEnum.h b/libazure/include/mozilla/TypedEnum.h
similarity index 100%
rename from include/mozilla/TypedEnum.h
rename to libazure/include/mozilla/TypedEnum.h
diff --git a/include/mozilla/Types.h b/libazure/include/mozilla/Types.h
similarity index 100%
rename from include/mozilla/Types.h
rename to libazure/include/mozilla/Types.h
diff --git a/include/mozilla/Util.h b/libazure/include/mozilla/Util.h
similarity index 100%
rename from include/mozilla/Util.h
rename to libazure/include/mozilla/Util.h
diff --git a/include/mozilla/fallible.h b/libazure/include/mozilla/fallible.h
similarity index 100%
rename from include/mozilla/fallible.h
rename to libazure/include/mozilla/fallible.h
diff --git a/include/mozilla/gfx/2D.h b/libazure/include/mozilla/gfx/2D.h
similarity index 100%
rename from include/mozilla/gfx/2D.h
rename to libazure/include/mozilla/gfx/2D.h
diff --git a/include/mozilla/gfx/BaseMargin.h b/libazure/include/mozilla/gfx/BaseMargin.h
similarity index 100%
rename from include/mozilla/gfx/BaseMargin.h
rename to libazure/include/mozilla/gfx/BaseMargin.h
diff --git a/include/mozilla/gfx/BasePoint.h b/libazure/include/mozilla/gfx/BasePoint.h
similarity index 100%
rename from include/mozilla/gfx/BasePoint.h
rename to libazure/include/mozilla/gfx/BasePoint.h
diff --git a/include/mozilla/gfx/BaseRect.h b/libazure/include/mozilla/gfx/BaseRect.h
similarity index 100%
rename from include/mozilla/gfx/BaseRect.h
rename to libazure/include/mozilla/gfx/BaseRect.h
diff --git a/include/mozilla/gfx/BaseSize.h b/libazure/include/mozilla/gfx/BaseSize.h
similarity index 100%
rename from include/mozilla/gfx/BaseSize.h
rename to libazure/include/mozilla/gfx/BaseSize.h
diff --git a/include/mozilla/gfx/Blur.h b/libazure/include/mozilla/gfx/Blur.h
similarity index 100%
rename from include/mozilla/gfx/Blur.h
rename to libazure/include/mozilla/gfx/Blur.h
diff --git a/include/mozilla/gfx/MacIOSurface.h b/libazure/include/mozilla/gfx/MacIOSurface.h
similarity index 100%
rename from include/mozilla/gfx/MacIOSurface.h
rename to libazure/include/mozilla/gfx/MacIOSurface.h
diff --git a/include/mozilla/gfx/Matrix.h b/libazure/include/mozilla/gfx/Matrix.h
similarity index 100%
rename from include/mozilla/gfx/Matrix.h
rename to libazure/include/mozilla/gfx/Matrix.h
diff --git a/include/mozilla/gfx/Point.h b/libazure/include/mozilla/gfx/Point.h
similarity index 100%
rename from include/mozilla/gfx/Point.h
rename to libazure/include/mozilla/gfx/Point.h
diff --git a/include/mozilla/gfx/Rect.h b/libazure/include/mozilla/gfx/Rect.h
similarity index 100%
rename from include/mozilla/gfx/Rect.h
rename to libazure/include/mozilla/gfx/Rect.h
diff --git a/include/mozilla/gfx/Types.h b/libazure/include/mozilla/gfx/Types.h
similarity index 100%
rename from include/mozilla/gfx/Types.h
rename to libazure/include/mozilla/gfx/Types.h
diff --git a/include/mozilla/gfx/UserData.h b/libazure/include/mozilla/gfx/UserData.h
similarity index 100%
rename from include/mozilla/gfx/UserData.h
rename to libazure/include/mozilla/gfx/UserData.h
diff --git a/include/mozilla/gfx/gl/GLDefs.h b/libazure/include/mozilla/gfx/gl/GLDefs.h
similarity index 100%
rename from include/mozilla/gfx/gl/GLDefs.h
rename to libazure/include/mozilla/gfx/gl/GLDefs.h
diff --git a/include/mozilla/ipc/chromium/src/base/basictypes.h b/libazure/include/mozilla/ipc/chromium/src/base/basictypes.h
similarity index 100%
rename from include/mozilla/ipc/chromium/src/base/basictypes.h
rename to libazure/include/mozilla/ipc/chromium/src/base/basictypes.h
diff --git a/include/mozilla/ipc/chromium/src/base/cpu.h b/libazure/include/mozilla/ipc/chromium/src/base/cpu.h
similarity index 100%
rename from include/mozilla/ipc/chromium/src/base/cpu.h
rename to libazure/include/mozilla/ipc/chromium/src/base/cpu.h
diff --git a/include/mozilla/ipc/chromium/src/base/port.h b/libazure/include/mozilla/ipc/chromium/src/base/port.h
similarity index 100%
rename from include/mozilla/ipc/chromium/src/base/port.h
rename to libazure/include/mozilla/ipc/chromium/src/base/port.h
diff --git a/include/mozilla/ipc/chromium/src/base/stack_container.h b/libazure/include/mozilla/ipc/chromium/src/base/stack_container.h
similarity index 100%
rename from include/mozilla/ipc/chromium/src/base/stack_container.h
rename to libazure/include/mozilla/ipc/chromium/src/base/stack_container.h
diff --git a/include/mozilla/ipc/chromium/src/build/build_config.h b/libazure/include/mozilla/ipc/chromium/src/build/build_config.h
similarity index 100%
rename from include/mozilla/ipc/chromium/src/build/build_config.h
rename to libazure/include/mozilla/ipc/chromium/src/build/build_config.h
diff --git a/include/mozilla/mozalloc.h b/libazure/include/mozilla/mozalloc.h
similarity index 100%
rename from include/mozilla/mozalloc.h
rename to libazure/include/mozilla/mozalloc.h
diff --git a/include/mozilla/mozalloc_abort.h b/libazure/include/mozilla/mozalloc_abort.h
similarity index 100%
rename from include/mozilla/mozalloc_abort.h
rename to libazure/include/mozilla/mozalloc_abort.h
diff --git a/include/mozilla/mozalloc_macro_wrappers.h b/libazure/include/mozilla/mozalloc_macro_wrappers.h
similarity index 100%
rename from include/mozilla/mozalloc_macro_wrappers.h
rename to libazure/include/mozilla/mozalloc_macro_wrappers.h
diff --git a/include/mozilla/mozalloc_oom.h b/libazure/include/mozilla/mozalloc_oom.h
similarity index 100%
rename from include/mozilla/mozalloc_oom.h
rename to libazure/include/mozilla/mozalloc_oom.h
diff --git a/include/obsolete/protypes.h b/libazure/include/obsolete/protypes.h
similarity index 100%
rename from include/obsolete/protypes.h
rename to libazure/include/obsolete/protypes.h
diff --git a/include/prcpucfg.h b/libazure/include/prcpucfg.h
similarity index 100%
rename from include/prcpucfg.h
rename to libazure/include/prcpucfg.h
diff --git a/include/prtypes.h b/libazure/include/prtypes.h
similarity index 100%
rename from include/prtypes.h
rename to libazure/include/prtypes.h
diff --git a/include/xpcom-config.h b/libazure/include/xpcom-config.h
similarity index 100%
rename from include/xpcom-config.h
rename to libazure/include/xpcom-config.h
diff --git a/src/gfx/2d/BasePoint3D.h b/libazure/src/gfx/2d/BasePoint3D.h
similarity index 100%
rename from src/gfx/2d/BasePoint3D.h
rename to libazure/src/gfx/2d/BasePoint3D.h
diff --git a/src/gfx/2d/BasePoint4D.h b/libazure/src/gfx/2d/BasePoint4D.h
similarity index 100%
rename from src/gfx/2d/BasePoint4D.h
rename to libazure/src/gfx/2d/BasePoint4D.h
diff --git a/src/gfx/2d/Blur.cpp b/libazure/src/gfx/2d/Blur.cpp
similarity index 100%
rename from src/gfx/2d/Blur.cpp
rename to libazure/src/gfx/2d/Blur.cpp
diff --git a/src/gfx/2d/BlurSSE2.cpp b/libazure/src/gfx/2d/BlurSSE2.cpp
similarity index 100%
rename from src/gfx/2d/BlurSSE2.cpp
rename to libazure/src/gfx/2d/BlurSSE2.cpp
diff --git a/src/gfx/2d/DrawEventRecorder.cpp b/libazure/src/gfx/2d/DrawEventRecorder.cpp
similarity index 100%
rename from src/gfx/2d/DrawEventRecorder.cpp
rename to libazure/src/gfx/2d/DrawEventRecorder.cpp
diff --git a/src/gfx/2d/DrawEventRecorder.h b/libazure/src/gfx/2d/DrawEventRecorder.h
similarity index 100%
rename from src/gfx/2d/DrawEventRecorder.h
rename to libazure/src/gfx/2d/DrawEventRecorder.h
diff --git a/src/gfx/2d/DrawTargetCG.cpp b/libazure/src/gfx/2d/DrawTargetCG.cpp
similarity index 100%
rename from src/gfx/2d/DrawTargetCG.cpp
rename to libazure/src/gfx/2d/DrawTargetCG.cpp
diff --git a/src/gfx/2d/DrawTargetCG.h b/libazure/src/gfx/2d/DrawTargetCG.h
similarity index 100%
rename from src/gfx/2d/DrawTargetCG.h
rename to libazure/src/gfx/2d/DrawTargetCG.h
diff --git a/src/gfx/2d/DrawTargetCairo.cpp b/libazure/src/gfx/2d/DrawTargetCairo.cpp
similarity index 100%
rename from src/gfx/2d/DrawTargetCairo.cpp
rename to libazure/src/gfx/2d/DrawTargetCairo.cpp
diff --git a/src/gfx/2d/DrawTargetCairo.h b/libazure/src/gfx/2d/DrawTargetCairo.h
similarity index 100%
rename from src/gfx/2d/DrawTargetCairo.h
rename to libazure/src/gfx/2d/DrawTargetCairo.h
diff --git a/src/gfx/2d/DrawTargetD2D.cpp b/libazure/src/gfx/2d/DrawTargetD2D.cpp
similarity index 100%
rename from src/gfx/2d/DrawTargetD2D.cpp
rename to libazure/src/gfx/2d/DrawTargetD2D.cpp
diff --git a/src/gfx/2d/DrawTargetD2D.h b/libazure/src/gfx/2d/DrawTargetD2D.h
similarity index 100%
rename from src/gfx/2d/DrawTargetD2D.h
rename to libazure/src/gfx/2d/DrawTargetD2D.h
diff --git a/src/gfx/2d/DrawTargetDual.cpp b/libazure/src/gfx/2d/DrawTargetDual.cpp
similarity index 100%
rename from src/gfx/2d/DrawTargetDual.cpp
rename to libazure/src/gfx/2d/DrawTargetDual.cpp
diff --git a/src/gfx/2d/DrawTargetDual.h b/libazure/src/gfx/2d/DrawTargetDual.h
similarity index 100%
rename from src/gfx/2d/DrawTargetDual.h
rename to libazure/src/gfx/2d/DrawTargetDual.h
diff --git a/src/gfx/2d/DrawTargetRecording.cpp b/libazure/src/gfx/2d/DrawTargetRecording.cpp
similarity index 100%
rename from src/gfx/2d/DrawTargetRecording.cpp
rename to libazure/src/gfx/2d/DrawTargetRecording.cpp
diff --git a/src/gfx/2d/DrawTargetRecording.h b/libazure/src/gfx/2d/DrawTargetRecording.h
similarity index 100%
rename from src/gfx/2d/DrawTargetRecording.h
rename to libazure/src/gfx/2d/DrawTargetRecording.h
diff --git a/src/gfx/2d/DrawTargetSkia.cpp b/libazure/src/gfx/2d/DrawTargetSkia.cpp
similarity index 100%
rename from src/gfx/2d/DrawTargetSkia.cpp
rename to libazure/src/gfx/2d/DrawTargetSkia.cpp
diff --git a/src/gfx/2d/DrawTargetSkia.h b/libazure/src/gfx/2d/DrawTargetSkia.h
similarity index 100%
rename from src/gfx/2d/DrawTargetSkia.h
rename to libazure/src/gfx/2d/DrawTargetSkia.h
diff --git a/src/gfx/2d/Factory.cpp b/libazure/src/gfx/2d/Factory.cpp
similarity index 100%
rename from src/gfx/2d/Factory.cpp
rename to libazure/src/gfx/2d/Factory.cpp
diff --git a/src/gfx/2d/GradientStopsD2D.h b/libazure/src/gfx/2d/GradientStopsD2D.h
similarity index 100%
rename from src/gfx/2d/GradientStopsD2D.h
rename to libazure/src/gfx/2d/GradientStopsD2D.h
diff --git a/src/gfx/2d/Helpers.h b/libazure/src/gfx/2d/Helpers.h
similarity index 100%
rename from src/gfx/2d/Helpers.h
rename to libazure/src/gfx/2d/Helpers.h
diff --git a/src/gfx/2d/HelpersCairo.h b/libazure/src/gfx/2d/HelpersCairo.h
similarity index 100%
rename from src/gfx/2d/HelpersCairo.h
rename to libazure/src/gfx/2d/HelpersCairo.h
diff --git a/src/gfx/2d/HelpersD2D.h b/libazure/src/gfx/2d/HelpersD2D.h
similarity index 100%
rename from src/gfx/2d/HelpersD2D.h
rename to libazure/src/gfx/2d/HelpersD2D.h
diff --git a/src/gfx/2d/HelpersSkia.h b/libazure/src/gfx/2d/HelpersSkia.h
similarity index 100%
rename from src/gfx/2d/HelpersSkia.h
rename to libazure/src/gfx/2d/HelpersSkia.h
diff --git a/src/gfx/2d/ImageScaling.cpp b/libazure/src/gfx/2d/ImageScaling.cpp
similarity index 100%
rename from src/gfx/2d/ImageScaling.cpp
rename to libazure/src/gfx/2d/ImageScaling.cpp
diff --git a/src/gfx/2d/ImageScaling.h b/libazure/src/gfx/2d/ImageScaling.h
similarity index 100%
rename from src/gfx/2d/ImageScaling.h
rename to libazure/src/gfx/2d/ImageScaling.h
diff --git a/src/gfx/2d/ImageScalingSSE2.cpp b/libazure/src/gfx/2d/ImageScalingSSE2.cpp
similarity index 100%
rename from src/gfx/2d/ImageScalingSSE2.cpp
rename to libazure/src/gfx/2d/ImageScalingSSE2.cpp
diff --git a/src/gfx/2d/Logging.h b/libazure/src/gfx/2d/Logging.h
similarity index 100%
rename from src/gfx/2d/Logging.h
rename to libazure/src/gfx/2d/Logging.h
diff --git a/src/gfx/2d/Makefile.in b/libazure/src/gfx/2d/Makefile.in
similarity index 100%
rename from src/gfx/2d/Makefile.in
rename to libazure/src/gfx/2d/Makefile.in
diff --git a/src/gfx/2d/Matrix.cpp b/libazure/src/gfx/2d/Matrix.cpp
similarity index 100%
rename from src/gfx/2d/Matrix.cpp
rename to libazure/src/gfx/2d/Matrix.cpp
diff --git a/src/gfx/2d/PathCG.cpp b/libazure/src/gfx/2d/PathCG.cpp
similarity index 100%
rename from src/gfx/2d/PathCG.cpp
rename to libazure/src/gfx/2d/PathCG.cpp
diff --git a/src/gfx/2d/PathCG.h b/libazure/src/gfx/2d/PathCG.h
similarity index 100%
rename from src/gfx/2d/PathCG.h
rename to libazure/src/gfx/2d/PathCG.h
diff --git a/src/gfx/2d/PathCairo.cpp b/libazure/src/gfx/2d/PathCairo.cpp
similarity index 100%
rename from src/gfx/2d/PathCairo.cpp
rename to libazure/src/gfx/2d/PathCairo.cpp
diff --git a/src/gfx/2d/PathCairo.h b/libazure/src/gfx/2d/PathCairo.h
similarity index 100%
rename from src/gfx/2d/PathCairo.h
rename to libazure/src/gfx/2d/PathCairo.h
diff --git a/src/gfx/2d/PathD2D.cpp b/libazure/src/gfx/2d/PathD2D.cpp
similarity index 100%
rename from src/gfx/2d/PathD2D.cpp
rename to libazure/src/gfx/2d/PathD2D.cpp
diff --git a/src/gfx/2d/PathD2D.h b/libazure/src/gfx/2d/PathD2D.h
similarity index 100%
rename from src/gfx/2d/PathD2D.h
rename to libazure/src/gfx/2d/PathD2D.h
diff --git a/src/gfx/2d/PathHelpers.h b/libazure/src/gfx/2d/PathHelpers.h
similarity index 100%
rename from src/gfx/2d/PathHelpers.h
rename to libazure/src/gfx/2d/PathHelpers.h
diff --git a/src/gfx/2d/PathRecording.cpp b/libazure/src/gfx/2d/PathRecording.cpp
similarity index 100%
rename from src/gfx/2d/PathRecording.cpp
rename to libazure/src/gfx/2d/PathRecording.cpp
diff --git a/src/gfx/2d/PathRecording.h b/libazure/src/gfx/2d/PathRecording.h
similarity index 100%
rename from src/gfx/2d/PathRecording.h
rename to libazure/src/gfx/2d/PathRecording.h
diff --git a/src/gfx/2d/PathSkia.cpp b/libazure/src/gfx/2d/PathSkia.cpp
similarity index 100%
rename from src/gfx/2d/PathSkia.cpp
rename to libazure/src/gfx/2d/PathSkia.cpp
diff --git a/src/gfx/2d/PathSkia.h b/libazure/src/gfx/2d/PathSkia.h
similarity index 100%
rename from src/gfx/2d/PathSkia.h
rename to libazure/src/gfx/2d/PathSkia.h
diff --git a/src/gfx/2d/QuartzSupport.h b/libazure/src/gfx/2d/QuartzSupport.h
similarity index 100%
rename from src/gfx/2d/QuartzSupport.h
rename to libazure/src/gfx/2d/QuartzSupport.h
diff --git a/src/gfx/2d/QuartzSupport.mm b/libazure/src/gfx/2d/QuartzSupport.mm
similarity index 100%
rename from src/gfx/2d/QuartzSupport.mm
rename to libazure/src/gfx/2d/QuartzSupport.mm
diff --git a/src/gfx/2d/RecordedEvent.cpp b/libazure/src/gfx/2d/RecordedEvent.cpp
similarity index 100%
rename from src/gfx/2d/RecordedEvent.cpp
rename to libazure/src/gfx/2d/RecordedEvent.cpp
diff --git a/src/gfx/2d/RecordedEvent.h b/libazure/src/gfx/2d/RecordedEvent.h
similarity index 100%
rename from src/gfx/2d/RecordedEvent.h
rename to libazure/src/gfx/2d/RecordedEvent.h
diff --git a/src/gfx/2d/RecordingTypes.h b/libazure/src/gfx/2d/RecordingTypes.h
similarity index 100%
rename from src/gfx/2d/RecordingTypes.h
rename to libazure/src/gfx/2d/RecordingTypes.h
diff --git a/src/gfx/2d/Rect.cpp b/libazure/src/gfx/2d/Rect.cpp
similarity index 100%
rename from src/gfx/2d/Rect.cpp
rename to libazure/src/gfx/2d/Rect.cpp
diff --git a/src/gfx/2d/SSEHelpers.h b/libazure/src/gfx/2d/SSEHelpers.h
similarity index 100%
rename from src/gfx/2d/SSEHelpers.h
rename to libazure/src/gfx/2d/SSEHelpers.h
diff --git a/src/gfx/2d/Scale.cpp b/libazure/src/gfx/2d/Scale.cpp
similarity index 100%
rename from src/gfx/2d/Scale.cpp
rename to libazure/src/gfx/2d/Scale.cpp
diff --git a/src/gfx/2d/Scale.h b/libazure/src/gfx/2d/Scale.h
similarity index 100%
rename from src/gfx/2d/Scale.h
rename to libazure/src/gfx/2d/Scale.h
diff --git a/src/gfx/2d/ScaledFontBase.cpp b/libazure/src/gfx/2d/ScaledFontBase.cpp
similarity index 100%
rename from src/gfx/2d/ScaledFontBase.cpp
rename to libazure/src/gfx/2d/ScaledFontBase.cpp
diff --git a/src/gfx/2d/ScaledFontBase.h b/libazure/src/gfx/2d/ScaledFontBase.h
similarity index 100%
rename from src/gfx/2d/ScaledFontBase.h
rename to libazure/src/gfx/2d/ScaledFontBase.h
diff --git a/src/gfx/2d/ScaledFontDWrite.cpp b/libazure/src/gfx/2d/ScaledFontDWrite.cpp
similarity index 100%
rename from src/gfx/2d/ScaledFontDWrite.cpp
rename to libazure/src/gfx/2d/ScaledFontDWrite.cpp
diff --git a/src/gfx/2d/ScaledFontDWrite.h b/libazure/src/gfx/2d/ScaledFontDWrite.h
similarity index 100%
rename from src/gfx/2d/ScaledFontDWrite.h
rename to libazure/src/gfx/2d/ScaledFontDWrite.h
diff --git a/src/gfx/2d/ScaledFontFreetype.cpp b/libazure/src/gfx/2d/ScaledFontFreetype.cpp
similarity index 100%
rename from src/gfx/2d/ScaledFontFreetype.cpp
rename to libazure/src/gfx/2d/ScaledFontFreetype.cpp
diff --git a/src/gfx/2d/ScaledFontFreetype.h b/libazure/src/gfx/2d/ScaledFontFreetype.h
similarity index 100%
rename from src/gfx/2d/ScaledFontFreetype.h
rename to libazure/src/gfx/2d/ScaledFontFreetype.h
diff --git a/src/gfx/2d/ScaledFontMac.cpp b/libazure/src/gfx/2d/ScaledFontMac.cpp
similarity index 100%
rename from src/gfx/2d/ScaledFontMac.cpp
rename to libazure/src/gfx/2d/ScaledFontMac.cpp
diff --git a/src/gfx/2d/ScaledFontMac.h b/libazure/src/gfx/2d/ScaledFontMac.h
similarity index 100%
rename from src/gfx/2d/ScaledFontMac.h
rename to libazure/src/gfx/2d/ScaledFontMac.h
diff --git a/src/gfx/2d/ScaledFontWin.cpp b/libazure/src/gfx/2d/ScaledFontWin.cpp
similarity index 100%
rename from src/gfx/2d/ScaledFontWin.cpp
rename to libazure/src/gfx/2d/ScaledFontWin.cpp
diff --git a/src/gfx/2d/ScaledFontWin.h b/libazure/src/gfx/2d/ScaledFontWin.h
similarity index 100%
rename from src/gfx/2d/ScaledFontWin.h
rename to libazure/src/gfx/2d/ScaledFontWin.h
diff --git a/src/gfx/2d/ShadersD2D.fx b/libazure/src/gfx/2d/ShadersD2D.fx
similarity index 100%
rename from src/gfx/2d/ShadersD2D.fx
rename to libazure/src/gfx/2d/ShadersD2D.fx
diff --git a/src/gfx/2d/ShadersD2D.h b/libazure/src/gfx/2d/ShadersD2D.h
similarity index 100%
rename from src/gfx/2d/ShadersD2D.h
rename to libazure/src/gfx/2d/ShadersD2D.h
diff --git a/src/gfx/2d/SourceSurfaceCG.cpp b/libazure/src/gfx/2d/SourceSurfaceCG.cpp
similarity index 100%
rename from src/gfx/2d/SourceSurfaceCG.cpp
rename to libazure/src/gfx/2d/SourceSurfaceCG.cpp
diff --git a/src/gfx/2d/SourceSurfaceCG.h b/libazure/src/gfx/2d/SourceSurfaceCG.h
similarity index 100%
rename from src/gfx/2d/SourceSurfaceCG.h
rename to libazure/src/gfx/2d/SourceSurfaceCG.h
diff --git a/src/gfx/2d/SourceSurfaceCairo.cpp b/libazure/src/gfx/2d/SourceSurfaceCairo.cpp
similarity index 100%
rename from src/gfx/2d/SourceSurfaceCairo.cpp
rename to libazure/src/gfx/2d/SourceSurfaceCairo.cpp
diff --git a/src/gfx/2d/SourceSurfaceCairo.h b/libazure/src/gfx/2d/SourceSurfaceCairo.h
similarity index 100%
rename from src/gfx/2d/SourceSurfaceCairo.h
rename to libazure/src/gfx/2d/SourceSurfaceCairo.h
diff --git a/src/gfx/2d/SourceSurfaceD2D.cpp b/libazure/src/gfx/2d/SourceSurfaceD2D.cpp
similarity index 100%
rename from src/gfx/2d/SourceSurfaceD2D.cpp
rename to libazure/src/gfx/2d/SourceSurfaceD2D.cpp
diff --git a/src/gfx/2d/SourceSurfaceD2D.h b/libazure/src/gfx/2d/SourceSurfaceD2D.h
similarity index 100%
rename from src/gfx/2d/SourceSurfaceD2D.h
rename to libazure/src/gfx/2d/SourceSurfaceD2D.h
diff --git a/src/gfx/2d/SourceSurfaceD2DTarget.cpp b/libazure/src/gfx/2d/SourceSurfaceD2DTarget.cpp
similarity index 100%
rename from src/gfx/2d/SourceSurfaceD2DTarget.cpp
rename to libazure/src/gfx/2d/SourceSurfaceD2DTarget.cpp
diff --git a/src/gfx/2d/SourceSurfaceD2DTarget.h b/libazure/src/gfx/2d/SourceSurfaceD2DTarget.h
similarity index 100%
rename from src/gfx/2d/SourceSurfaceD2DTarget.h
rename to libazure/src/gfx/2d/SourceSurfaceD2DTarget.h
diff --git a/src/gfx/2d/SourceSurfaceDual.h b/libazure/src/gfx/2d/SourceSurfaceDual.h
similarity index 100%
rename from src/gfx/2d/SourceSurfaceDual.h
rename to libazure/src/gfx/2d/SourceSurfaceDual.h
diff --git a/src/gfx/2d/SourceSurfaceRawData.cpp b/libazure/src/gfx/2d/SourceSurfaceRawData.cpp
similarity index 100%
rename from src/gfx/2d/SourceSurfaceRawData.cpp
rename to libazure/src/gfx/2d/SourceSurfaceRawData.cpp
diff --git a/src/gfx/2d/SourceSurfaceRawData.h b/libazure/src/gfx/2d/SourceSurfaceRawData.h
similarity index 100%
rename from src/gfx/2d/SourceSurfaceRawData.h
rename to libazure/src/gfx/2d/SourceSurfaceRawData.h
diff --git a/src/gfx/2d/SourceSurfaceSkia.cpp b/libazure/src/gfx/2d/SourceSurfaceSkia.cpp
similarity index 100%
rename from src/gfx/2d/SourceSurfaceSkia.cpp
rename to libazure/src/gfx/2d/SourceSurfaceSkia.cpp
diff --git a/src/gfx/2d/SourceSurfaceSkia.h b/libazure/src/gfx/2d/SourceSurfaceSkia.h
similarity index 100%
rename from src/gfx/2d/SourceSurfaceSkia.h
rename to libazure/src/gfx/2d/SourceSurfaceSkia.h
diff --git a/src/gfx/2d/Tools.h b/libazure/src/gfx/2d/Tools.h
similarity index 100%
rename from src/gfx/2d/Tools.h
rename to libazure/src/gfx/2d/Tools.h
diff --git a/src/gfx/2d/convolver.cpp b/libazure/src/gfx/2d/convolver.cpp
similarity index 100%
rename from src/gfx/2d/convolver.cpp
rename to libazure/src/gfx/2d/convolver.cpp
diff --git a/src/gfx/2d/convolver.h b/libazure/src/gfx/2d/convolver.h
similarity index 100%
rename from src/gfx/2d/convolver.h
rename to libazure/src/gfx/2d/convolver.h
diff --git a/src/gfx/2d/genshaders.sh b/libazure/src/gfx/2d/genshaders.sh
similarity index 100%
rename from src/gfx/2d/genshaders.sh
rename to libazure/src/gfx/2d/genshaders.sh
diff --git a/src/gfx/2d/gfx2d.sln b/libazure/src/gfx/2d/gfx2d.sln
similarity index 100%
rename from src/gfx/2d/gfx2d.sln
rename to libazure/src/gfx/2d/gfx2d.sln
diff --git a/src/gfx/2d/gfx2d.vcxproj b/libazure/src/gfx/2d/gfx2d.vcxproj
similarity index 100%
rename from src/gfx/2d/gfx2d.vcxproj
rename to libazure/src/gfx/2d/gfx2d.vcxproj
diff --git a/src/gfx/2d/image_operations.cpp b/libazure/src/gfx/2d/image_operations.cpp
similarity index 100%
rename from src/gfx/2d/image_operations.cpp
rename to libazure/src/gfx/2d/image_operations.cpp
diff --git a/src/gfx/2d/image_operations.h b/libazure/src/gfx/2d/image_operations.h
similarity index 100%
rename from src/gfx/2d/image_operations.h
rename to libazure/src/gfx/2d/image_operations.h
diff --git a/src/gfx/2d/moz-d2d1-1.h b/libazure/src/gfx/2d/moz-d2d1-1.h
similarity index 100%
rename from src/gfx/2d/moz-d2d1-1.h
rename to libazure/src/gfx/2d/moz-d2d1-1.h
diff --git a/src/gfx/2d/moz.build b/libazure/src/gfx/2d/moz.build
similarity index 100%
rename from src/gfx/2d/moz.build
rename to libazure/src/gfx/2d/moz.build
diff --git a/src/gfx/2d/unittest/GTestMain.cpp b/libazure/src/gfx/2d/unittest/GTestMain.cpp
similarity index 100%
rename from src/gfx/2d/unittest/GTestMain.cpp
rename to libazure/src/gfx/2d/unittest/GTestMain.cpp
diff --git a/src/gfx/2d/unittest/Main.cpp b/libazure/src/gfx/2d/unittest/Main.cpp
similarity index 100%
rename from src/gfx/2d/unittest/Main.cpp
rename to libazure/src/gfx/2d/unittest/Main.cpp
diff --git a/src/gfx/2d/unittest/SanityChecks.cpp b/libazure/src/gfx/2d/unittest/SanityChecks.cpp
similarity index 100%
rename from src/gfx/2d/unittest/SanityChecks.cpp
rename to libazure/src/gfx/2d/unittest/SanityChecks.cpp
diff --git a/src/gfx/2d/unittest/SanityChecks.h b/libazure/src/gfx/2d/unittest/SanityChecks.h
similarity index 100%
rename from src/gfx/2d/unittest/SanityChecks.h
rename to libazure/src/gfx/2d/unittest/SanityChecks.h
diff --git a/src/gfx/2d/unittest/TestBase.cpp b/libazure/src/gfx/2d/unittest/TestBase.cpp
similarity index 100%
rename from src/gfx/2d/unittest/TestBase.cpp
rename to libazure/src/gfx/2d/unittest/TestBase.cpp
diff --git a/src/gfx/2d/unittest/TestBase.h b/libazure/src/gfx/2d/unittest/TestBase.h
similarity index 100%
rename from src/gfx/2d/unittest/TestBase.h
rename to libazure/src/gfx/2d/unittest/TestBase.h
diff --git a/src/gfx/2d/unittest/TestCairo.cpp b/libazure/src/gfx/2d/unittest/TestCairo.cpp
similarity index 100%
rename from src/gfx/2d/unittest/TestCairo.cpp
rename to libazure/src/gfx/2d/unittest/TestCairo.cpp
diff --git a/src/gfx/2d/unittest/TestDrawTargetBase.cpp b/libazure/src/gfx/2d/unittest/TestDrawTargetBase.cpp
similarity index 100%
rename from src/gfx/2d/unittest/TestDrawTargetBase.cpp
rename to libazure/src/gfx/2d/unittest/TestDrawTargetBase.cpp
diff --git a/src/gfx/2d/unittest/TestDrawTargetBase.h b/libazure/src/gfx/2d/unittest/TestDrawTargetBase.h
similarity index 100%
rename from src/gfx/2d/unittest/TestDrawTargetBase.h
rename to libazure/src/gfx/2d/unittest/TestDrawTargetBase.h
diff --git a/src/gfx/2d/unittest/TestDrawTargetD2D.cpp b/libazure/src/gfx/2d/unittest/TestDrawTargetD2D.cpp
similarity index 100%
rename from src/gfx/2d/unittest/TestDrawTargetD2D.cpp
rename to libazure/src/gfx/2d/unittest/TestDrawTargetD2D.cpp
diff --git a/src/gfx/2d/unittest/TestDrawTargetD2D.h b/libazure/src/gfx/2d/unittest/TestDrawTargetD2D.h
similarity index 100%
rename from src/gfx/2d/unittest/TestDrawTargetD2D.h
rename to libazure/src/gfx/2d/unittest/TestDrawTargetD2D.h
diff --git a/src/gfx/2d/unittest/TestPoint.cpp b/libazure/src/gfx/2d/unittest/TestPoint.cpp
similarity index 100%
rename from src/gfx/2d/unittest/TestPoint.cpp
rename to libazure/src/gfx/2d/unittest/TestPoint.cpp
diff --git a/src/gfx/2d/unittest/TestPoint.h b/libazure/src/gfx/2d/unittest/TestPoint.h
similarity index 100%
rename from src/gfx/2d/unittest/TestPoint.h
rename to libazure/src/gfx/2d/unittest/TestPoint.h
diff --git a/src/gfx/2d/unittest/TestScaling.cpp b/libazure/src/gfx/2d/unittest/TestScaling.cpp
similarity index 100%
rename from src/gfx/2d/unittest/TestScaling.cpp
rename to libazure/src/gfx/2d/unittest/TestScaling.cpp
diff --git a/src/gfx/2d/unittest/TestScaling.h b/libazure/src/gfx/2d/unittest/TestScaling.h
similarity index 100%
rename from src/gfx/2d/unittest/TestScaling.h
rename to libazure/src/gfx/2d/unittest/TestScaling.h
diff --git a/src/gfx/2d/unittest/unittest.vcxproj b/libazure/src/gfx/2d/unittest/unittest.vcxproj
similarity index 100%
rename from src/gfx/2d/unittest/unittest.vcxproj
rename to libazure/src/gfx/2d/unittest/unittest.vcxproj
diff --git a/src/gfx/gl/ForceDiscreteGPUHelperCGL.h b/libazure/src/gfx/gl/ForceDiscreteGPUHelperCGL.h
similarity index 100%
rename from src/gfx/gl/ForceDiscreteGPUHelperCGL.h
rename to libazure/src/gfx/gl/ForceDiscreteGPUHelperCGL.h
diff --git a/src/gfx/gl/GLContext.cpp b/libazure/src/gfx/gl/GLContext.cpp
similarity index 100%
rename from src/gfx/gl/GLContext.cpp
rename to libazure/src/gfx/gl/GLContext.cpp
diff --git a/src/gfx/gl/GLContext.h b/libazure/src/gfx/gl/GLContext.h
similarity index 100%
rename from src/gfx/gl/GLContext.h
rename to libazure/src/gfx/gl/GLContext.h
diff --git a/src/gfx/gl/GLContextProvider.h b/libazure/src/gfx/gl/GLContextProvider.h
similarity index 100%
rename from src/gfx/gl/GLContextProvider.h
rename to libazure/src/gfx/gl/GLContextProvider.h
diff --git a/src/gfx/gl/GLContextProviderCGL.mm b/libazure/src/gfx/gl/GLContextProviderCGL.mm
similarity index 100%
rename from src/gfx/gl/GLContextProviderCGL.mm
rename to libazure/src/gfx/gl/GLContextProviderCGL.mm
diff --git a/src/gfx/gl/GLContextProviderEGL.cpp b/libazure/src/gfx/gl/GLContextProviderEGL.cpp
similarity index 100%
rename from src/gfx/gl/GLContextProviderEGL.cpp
rename to libazure/src/gfx/gl/GLContextProviderEGL.cpp
diff --git a/src/gfx/gl/GLContextProviderGLX.cpp b/libazure/src/gfx/gl/GLContextProviderGLX.cpp
similarity index 100%
rename from src/gfx/gl/GLContextProviderGLX.cpp
rename to libazure/src/gfx/gl/GLContextProviderGLX.cpp
diff --git a/src/gfx/gl/GLContextProviderImpl.h b/libazure/src/gfx/gl/GLContextProviderImpl.h
similarity index 100%
rename from src/gfx/gl/GLContextProviderImpl.h
rename to libazure/src/gfx/gl/GLContextProviderImpl.h
diff --git a/src/gfx/gl/GLContextProviderNull.cpp b/libazure/src/gfx/gl/GLContextProviderNull.cpp
similarity index 100%
rename from src/gfx/gl/GLContextProviderNull.cpp
rename to libazure/src/gfx/gl/GLContextProviderNull.cpp
diff --git a/src/gfx/gl/GLContextProviderWGL.cpp b/libazure/src/gfx/gl/GLContextProviderWGL.cpp
similarity index 100%
rename from src/gfx/gl/GLContextProviderWGL.cpp
rename to libazure/src/gfx/gl/GLContextProviderWGL.cpp
diff --git a/src/gfx/gl/GLContextSkia.cpp b/libazure/src/gfx/gl/GLContextSkia.cpp
similarity index 100%
rename from src/gfx/gl/GLContextSkia.cpp
rename to libazure/src/gfx/gl/GLContextSkia.cpp
diff --git a/src/gfx/gl/GLContextSkia.h b/libazure/src/gfx/gl/GLContextSkia.h
similarity index 100%
rename from src/gfx/gl/GLContextSkia.h
rename to libazure/src/gfx/gl/GLContextSkia.h
diff --git a/src/gfx/gl/GLContextSymbols.h b/libazure/src/gfx/gl/GLContextSymbols.h
similarity index 100%
rename from src/gfx/gl/GLContextSymbols.h
rename to libazure/src/gfx/gl/GLContextSymbols.h
diff --git a/src/gfx/gl/GLContextTypes.cpp b/libazure/src/gfx/gl/GLContextTypes.cpp
similarity index 100%
rename from src/gfx/gl/GLContextTypes.cpp
rename to libazure/src/gfx/gl/GLContextTypes.cpp
diff --git a/src/gfx/gl/GLContextTypes.h b/libazure/src/gfx/gl/GLContextTypes.h
similarity index 100%
rename from src/gfx/gl/GLContextTypes.h
rename to libazure/src/gfx/gl/GLContextTypes.h
diff --git a/src/gfx/gl/GLContextUtils.cpp b/libazure/src/gfx/gl/GLContextUtils.cpp
similarity index 100%
rename from src/gfx/gl/GLContextUtils.cpp
rename to libazure/src/gfx/gl/GLContextUtils.cpp
diff --git a/src/gfx/gl/GLLibraryEGL.cpp b/libazure/src/gfx/gl/GLLibraryEGL.cpp
similarity index 100%
rename from src/gfx/gl/GLLibraryEGL.cpp
rename to libazure/src/gfx/gl/GLLibraryEGL.cpp
diff --git a/src/gfx/gl/GLLibraryEGL.h b/libazure/src/gfx/gl/GLLibraryEGL.h
similarity index 100%
rename from src/gfx/gl/GLLibraryEGL.h
rename to libazure/src/gfx/gl/GLLibraryEGL.h
diff --git a/src/gfx/gl/GLLibraryLoader.cpp b/libazure/src/gfx/gl/GLLibraryLoader.cpp
similarity index 100%
rename from src/gfx/gl/GLLibraryLoader.cpp
rename to libazure/src/gfx/gl/GLLibraryLoader.cpp
diff --git a/src/gfx/gl/GLLibraryLoader.h b/libazure/src/gfx/gl/GLLibraryLoader.h
similarity index 100%
rename from src/gfx/gl/GLLibraryLoader.h
rename to libazure/src/gfx/gl/GLLibraryLoader.h
diff --git a/src/gfx/gl/GLScreenBuffer.cpp b/libazure/src/gfx/gl/GLScreenBuffer.cpp
similarity index 100%
rename from src/gfx/gl/GLScreenBuffer.cpp
rename to libazure/src/gfx/gl/GLScreenBuffer.cpp
diff --git a/src/gfx/gl/GLScreenBuffer.h b/libazure/src/gfx/gl/GLScreenBuffer.h
similarity index 100%
rename from src/gfx/gl/GLScreenBuffer.h
rename to libazure/src/gfx/gl/GLScreenBuffer.h
diff --git a/src/gfx/gl/GLTextureImage.cpp b/libazure/src/gfx/gl/GLTextureImage.cpp
similarity index 100%
rename from src/gfx/gl/GLTextureImage.cpp
rename to libazure/src/gfx/gl/GLTextureImage.cpp
diff --git a/src/gfx/gl/GLTextureImage.h b/libazure/src/gfx/gl/GLTextureImage.h
similarity index 100%
rename from src/gfx/gl/GLTextureImage.h
rename to libazure/src/gfx/gl/GLTextureImage.h
diff --git a/src/gfx/gl/GLXLibrary.h b/libazure/src/gfx/gl/GLXLibrary.h
similarity index 100%
rename from src/gfx/gl/GLXLibrary.h
rename to libazure/src/gfx/gl/GLXLibrary.h
diff --git a/src/gfx/gl/Makefile.in b/libazure/src/gfx/gl/Makefile.in
similarity index 100%
rename from src/gfx/gl/Makefile.in
rename to libazure/src/gfx/gl/Makefile.in
diff --git a/src/gfx/gl/SharedSurface.cpp b/libazure/src/gfx/gl/SharedSurface.cpp
similarity index 100%
rename from src/gfx/gl/SharedSurface.cpp
rename to libazure/src/gfx/gl/SharedSurface.cpp
diff --git a/src/gfx/gl/SharedSurface.h b/libazure/src/gfx/gl/SharedSurface.h
similarity index 100%
rename from src/gfx/gl/SharedSurface.h
rename to libazure/src/gfx/gl/SharedSurface.h
diff --git a/src/gfx/gl/SharedSurfaceANGLE.cpp b/libazure/src/gfx/gl/SharedSurfaceANGLE.cpp
similarity index 100%
rename from src/gfx/gl/SharedSurfaceANGLE.cpp
rename to libazure/src/gfx/gl/SharedSurfaceANGLE.cpp
diff --git a/src/gfx/gl/SharedSurfaceANGLE.h b/libazure/src/gfx/gl/SharedSurfaceANGLE.h
similarity index 100%
rename from src/gfx/gl/SharedSurfaceANGLE.h
rename to libazure/src/gfx/gl/SharedSurfaceANGLE.h
diff --git a/src/gfx/gl/SharedSurfaceEGL.cpp b/libazure/src/gfx/gl/SharedSurfaceEGL.cpp
similarity index 100%
rename from src/gfx/gl/SharedSurfaceEGL.cpp
rename to libazure/src/gfx/gl/SharedSurfaceEGL.cpp
diff --git a/src/gfx/gl/SharedSurfaceEGL.h b/libazure/src/gfx/gl/SharedSurfaceEGL.h
similarity index 100%
rename from src/gfx/gl/SharedSurfaceEGL.h
rename to libazure/src/gfx/gl/SharedSurfaceEGL.h
diff --git a/src/gfx/gl/SharedSurfaceGL.cpp b/libazure/src/gfx/gl/SharedSurfaceGL.cpp
similarity index 100%
rename from src/gfx/gl/SharedSurfaceGL.cpp
rename to libazure/src/gfx/gl/SharedSurfaceGL.cpp
diff --git a/src/gfx/gl/SharedSurfaceGL.h b/libazure/src/gfx/gl/SharedSurfaceGL.h
similarity index 100%
rename from src/gfx/gl/SharedSurfaceGL.h
rename to libazure/src/gfx/gl/SharedSurfaceGL.h
diff --git a/src/gfx/gl/SurfaceFactory.cpp b/libazure/src/gfx/gl/SurfaceFactory.cpp
similarity index 100%
rename from src/gfx/gl/SurfaceFactory.cpp
rename to libazure/src/gfx/gl/SurfaceFactory.cpp
diff --git a/src/gfx/gl/SurfaceFactory.h b/libazure/src/gfx/gl/SurfaceFactory.h
similarity index 100%
rename from src/gfx/gl/SurfaceFactory.h
rename to libazure/src/gfx/gl/SurfaceFactory.h
diff --git a/src/gfx/gl/SurfaceStream.cpp b/libazure/src/gfx/gl/SurfaceStream.cpp
similarity index 100%
rename from src/gfx/gl/SurfaceStream.cpp
rename to libazure/src/gfx/gl/SurfaceStream.cpp
diff --git a/src/gfx/gl/SurfaceStream.h b/libazure/src/gfx/gl/SurfaceStream.h
similarity index 100%
rename from src/gfx/gl/SurfaceStream.h
rename to libazure/src/gfx/gl/SurfaceStream.h
diff --git a/src/gfx/gl/SurfaceTypes.h b/libazure/src/gfx/gl/SurfaceTypes.h
similarity index 100%
rename from src/gfx/gl/SurfaceTypes.h
rename to libazure/src/gfx/gl/SurfaceTypes.h
diff --git a/src/gfx/gl/WGLLibrary.h b/libazure/src/gfx/gl/WGLLibrary.h
similarity index 100%
rename from src/gfx/gl/WGLLibrary.h
rename to libazure/src/gfx/gl/WGLLibrary.h
diff --git a/src/gfx/gl/moz.build b/libazure/src/gfx/gl/moz.build
similarity index 100%
rename from src/gfx/gl/moz.build
rename to libazure/src/gfx/gl/moz.build
diff --git a/src/memory/mozalloc/Makefile.in b/libazure/src/memory/mozalloc/Makefile.in
similarity index 100%
rename from src/memory/mozalloc/Makefile.in
rename to libazure/src/memory/mozalloc/Makefile.in
diff --git a/src/memory/mozalloc/moz.build b/libazure/src/memory/mozalloc/moz.build
similarity index 100%
rename from src/memory/mozalloc/moz.build
rename to libazure/src/memory/mozalloc/moz.build
diff --git a/src/memory/mozalloc/mozalloc.cpp b/libazure/src/memory/mozalloc/mozalloc.cpp
similarity index 100%
rename from src/memory/mozalloc/mozalloc.cpp
rename to libazure/src/memory/mozalloc/mozalloc.cpp
diff --git a/src/memory/mozalloc/mozalloc_abort.cpp b/libazure/src/memory/mozalloc/mozalloc_abort.cpp
similarity index 100%
rename from src/memory/mozalloc/mozalloc_abort.cpp
rename to libazure/src/memory/mozalloc/mozalloc_abort.cpp
diff --git a/src/memory/mozalloc/mozalloc_oom.cpp b/libazure/src/memory/mozalloc/mozalloc_oom.cpp
similarity index 100%
rename from src/memory/mozalloc/mozalloc_oom.cpp
rename to libazure/src/memory/mozalloc/mozalloc_oom.cpp
diff --git a/src/memory/mozalloc/mozalloc_undef_macro_wrappers.h b/libazure/src/memory/mozalloc/mozalloc_undef_macro_wrappers.h
similarity index 100%
rename from src/memory/mozalloc/mozalloc_undef_macro_wrappers.h
rename to libazure/src/memory/mozalloc/mozalloc_undef_macro_wrappers.h
diff --git a/src/memory/mozalloc/msvc_raise_wrappers.cpp b/libazure/src/memory/mozalloc/msvc_raise_wrappers.cpp
similarity index 100%
rename from src/memory/mozalloc/msvc_raise_wrappers.cpp
rename to libazure/src/memory/mozalloc/msvc_raise_wrappers.cpp
diff --git a/src/memory/mozalloc/msvc_raise_wrappers.h b/libazure/src/memory/mozalloc/msvc_raise_wrappers.h
similarity index 100%
rename from src/memory/mozalloc/msvc_raise_wrappers.h
rename to libazure/src/memory/mozalloc/msvc_raise_wrappers.h
diff --git a/src/memory/mozalloc/msvc_throw_wrapper.cpp b/libazure/src/memory/mozalloc/msvc_throw_wrapper.cpp
similarity index 100%
rename from src/memory/mozalloc/msvc_throw_wrapper.cpp
rename to libazure/src/memory/mozalloc/msvc_throw_wrapper.cpp
diff --git a/src/memory/mozalloc/msvc_throw_wrapper.h b/libazure/src/memory/mozalloc/msvc_throw_wrapper.h
similarity index 100%
rename from src/memory/mozalloc/msvc_throw_wrapper.h
rename to libazure/src/memory/mozalloc/msvc_throw_wrapper.h
diff --git a/src/memory/mozalloc/throw_gcc.h b/libazure/src/memory/mozalloc/throw_gcc.h
similarity index 100%
rename from src/memory/mozalloc/throw_gcc.h
rename to libazure/src/memory/mozalloc/throw_gcc.h
diff --git a/src/memory/mozalloc/throw_msvc.h b/libazure/src/memory/mozalloc/throw_msvc.h
similarity index 100%
rename from src/memory/mozalloc/throw_msvc.h
rename to libazure/src/memory/mozalloc/throw_msvc.h
diff --git a/src/mfbt/BloomFilter.h b/libazure/src/mfbt/BloomFilter.h
similarity index 100%
rename from src/mfbt/BloomFilter.h
rename to libazure/src/mfbt/BloomFilter.h
diff --git a/src/mfbt/Char16.h b/libazure/src/mfbt/Char16.h
similarity index 100%
rename from src/mfbt/Char16.h
rename to libazure/src/mfbt/Char16.h
diff --git a/src/mfbt/DebugOnly.h b/libazure/src/mfbt/DebugOnly.h
similarity index 100%
rename from src/mfbt/DebugOnly.h
rename to libazure/src/mfbt/DebugOnly.h
diff --git a/src/mfbt/Endian.h b/libazure/src/mfbt/Endian.h
similarity index 100%
rename from src/mfbt/Endian.h
rename to libazure/src/mfbt/Endian.h
diff --git a/src/mfbt/EnumSet.h b/libazure/src/mfbt/EnumSet.h
similarity index 100%
rename from src/mfbt/EnumSet.h
rename to libazure/src/mfbt/EnumSet.h
diff --git a/src/mfbt/FloatingPoint.h b/libazure/src/mfbt/FloatingPoint.h
similarity index 100%
rename from src/mfbt/FloatingPoint.h
rename to libazure/src/mfbt/FloatingPoint.h
diff --git a/src/mfbt/GuardObjects.h b/libazure/src/mfbt/GuardObjects.h
similarity index 100%
rename from src/mfbt/GuardObjects.h
rename to libazure/src/mfbt/GuardObjects.h
diff --git a/src/mfbt/HashFunctions.cpp b/libazure/src/mfbt/HashFunctions.cpp
similarity index 100%
rename from src/mfbt/HashFunctions.cpp
rename to libazure/src/mfbt/HashFunctions.cpp
diff --git a/src/mfbt/HashFunctions.h b/libazure/src/mfbt/HashFunctions.h
similarity index 100%
rename from src/mfbt/HashFunctions.h
rename to libazure/src/mfbt/HashFunctions.h
diff --git a/src/mfbt/LinkedList.h b/libazure/src/mfbt/LinkedList.h
similarity index 100%
rename from src/mfbt/LinkedList.h
rename to libazure/src/mfbt/LinkedList.h
diff --git a/src/mfbt/MSStdInt.h b/libazure/src/mfbt/MSStdInt.h
similarity index 100%
rename from src/mfbt/MSStdInt.h
rename to libazure/src/mfbt/MSStdInt.h
diff --git a/src/mfbt/Makefile.in b/libazure/src/mfbt/Makefile.in
similarity index 100%
rename from src/mfbt/Makefile.in
rename to libazure/src/mfbt/Makefile.in
diff --git a/src/mfbt/MathAlgorithms.h b/libazure/src/mfbt/MathAlgorithms.h
similarity index 100%
rename from src/mfbt/MathAlgorithms.h
rename to libazure/src/mfbt/MathAlgorithms.h
diff --git a/src/mfbt/MemoryChecking.h b/libazure/src/mfbt/MemoryChecking.h
similarity index 100%
rename from src/mfbt/MemoryChecking.h
rename to libazure/src/mfbt/MemoryChecking.h
diff --git a/src/mfbt/PodOperations.h b/libazure/src/mfbt/PodOperations.h
similarity index 100%
rename from src/mfbt/PodOperations.h
rename to libazure/src/mfbt/PodOperations.h
diff --git a/src/mfbt/Range.h b/libazure/src/mfbt/Range.h
similarity index 100%
rename from src/mfbt/Range.h
rename to libazure/src/mfbt/Range.h
diff --git a/src/mfbt/RangedPtr.h b/libazure/src/mfbt/RangedPtr.h
similarity index 100%
rename from src/mfbt/RangedPtr.h
rename to libazure/src/mfbt/RangedPtr.h
diff --git a/src/mfbt/SHA1.cpp b/libazure/src/mfbt/SHA1.cpp
similarity index 100%
rename from src/mfbt/SHA1.cpp
rename to libazure/src/mfbt/SHA1.cpp
diff --git a/src/mfbt/SHA1.h b/libazure/src/mfbt/SHA1.h
similarity index 100%
rename from src/mfbt/SHA1.h
rename to libazure/src/mfbt/SHA1.h
diff --git a/src/mfbt/STYLE b/libazure/src/mfbt/STYLE
similarity index 100%
rename from src/mfbt/STYLE
rename to libazure/src/mfbt/STYLE
diff --git a/src/mfbt/Scoped.h b/libazure/src/mfbt/Scoped.h
similarity index 100%
rename from src/mfbt/Scoped.h
rename to libazure/src/mfbt/Scoped.h
diff --git a/src/mfbt/SplayTree.h b/libazure/src/mfbt/SplayTree.h
similarity index 100%
rename from src/mfbt/SplayTree.h
rename to libazure/src/mfbt/SplayTree.h
diff --git a/src/mfbt/ThreadLocal.h b/libazure/src/mfbt/ThreadLocal.h
similarity index 100%
rename from src/mfbt/ThreadLocal.h
rename to libazure/src/mfbt/ThreadLocal.h
diff --git a/src/mfbt/TypeTraits.h b/libazure/src/mfbt/TypeTraits.h
similarity index 100%
rename from src/mfbt/TypeTraits.h
rename to libazure/src/mfbt/TypeTraits.h
diff --git a/src/mfbt/WeakPtr.h b/libazure/src/mfbt/WeakPtr.h
similarity index 100%
rename from src/mfbt/WeakPtr.h
rename to libazure/src/mfbt/WeakPtr.h
diff --git a/src/mfbt/double-conversion/LICENSE b/libazure/src/mfbt/double-conversion/LICENSE
similarity index 100%
rename from src/mfbt/double-conversion/LICENSE
rename to libazure/src/mfbt/double-conversion/LICENSE
diff --git a/src/mfbt/double-conversion/README b/libazure/src/mfbt/double-conversion/README
similarity index 100%
rename from src/mfbt/double-conversion/README
rename to libazure/src/mfbt/double-conversion/README
diff --git a/src/mfbt/double-conversion/add-mfbt-api-markers.patch b/libazure/src/mfbt/double-conversion/add-mfbt-api-markers.patch
similarity index 100%
rename from src/mfbt/double-conversion/add-mfbt-api-markers.patch
rename to libazure/src/mfbt/double-conversion/add-mfbt-api-markers.patch
diff --git a/src/mfbt/double-conversion/bignum-dtoa.cc b/libazure/src/mfbt/double-conversion/bignum-dtoa.cc
similarity index 100%
rename from src/mfbt/double-conversion/bignum-dtoa.cc
rename to libazure/src/mfbt/double-conversion/bignum-dtoa.cc
diff --git a/src/mfbt/double-conversion/bignum-dtoa.h b/libazure/src/mfbt/double-conversion/bignum-dtoa.h
similarity index 100%
rename from src/mfbt/double-conversion/bignum-dtoa.h
rename to libazure/src/mfbt/double-conversion/bignum-dtoa.h
diff --git a/src/mfbt/double-conversion/bignum.cc b/libazure/src/mfbt/double-conversion/bignum.cc
similarity index 100%
rename from src/mfbt/double-conversion/bignum.cc
rename to libazure/src/mfbt/double-conversion/bignum.cc
diff --git a/src/mfbt/double-conversion/bignum.h b/libazure/src/mfbt/double-conversion/bignum.h
similarity index 100%
rename from src/mfbt/double-conversion/bignum.h
rename to libazure/src/mfbt/double-conversion/bignum.h
diff --git a/src/mfbt/double-conversion/cached-powers.cc b/libazure/src/mfbt/double-conversion/cached-powers.cc
similarity index 100%
rename from src/mfbt/double-conversion/cached-powers.cc
rename to libazure/src/mfbt/double-conversion/cached-powers.cc
diff --git a/src/mfbt/double-conversion/cached-powers.h b/libazure/src/mfbt/double-conversion/cached-powers.h
similarity index 100%
rename from src/mfbt/double-conversion/cached-powers.h
rename to libazure/src/mfbt/double-conversion/cached-powers.h
diff --git a/src/mfbt/double-conversion/diy-fp.cc b/libazure/src/mfbt/double-conversion/diy-fp.cc
similarity index 100%
rename from src/mfbt/double-conversion/diy-fp.cc
rename to libazure/src/mfbt/double-conversion/diy-fp.cc
diff --git a/src/mfbt/double-conversion/diy-fp.h b/libazure/src/mfbt/double-conversion/diy-fp.h
similarity index 100%
rename from src/mfbt/double-conversion/diy-fp.h
rename to libazure/src/mfbt/double-conversion/diy-fp.h
diff --git a/src/mfbt/double-conversion/double-conversion.cc b/libazure/src/mfbt/double-conversion/double-conversion.cc
similarity index 100%
rename from src/mfbt/double-conversion/double-conversion.cc
rename to libazure/src/mfbt/double-conversion/double-conversion.cc
diff --git a/src/mfbt/double-conversion/double-conversion.h b/libazure/src/mfbt/double-conversion/double-conversion.h
similarity index 100%
rename from src/mfbt/double-conversion/double-conversion.h
rename to libazure/src/mfbt/double-conversion/double-conversion.h
diff --git a/src/mfbt/double-conversion/fast-dtoa.cc b/libazure/src/mfbt/double-conversion/fast-dtoa.cc
similarity index 100%
rename from src/mfbt/double-conversion/fast-dtoa.cc
rename to libazure/src/mfbt/double-conversion/fast-dtoa.cc
diff --git a/src/mfbt/double-conversion/fast-dtoa.h b/libazure/src/mfbt/double-conversion/fast-dtoa.h
similarity index 100%
rename from src/mfbt/double-conversion/fast-dtoa.h
rename to libazure/src/mfbt/double-conversion/fast-dtoa.h
diff --git a/src/mfbt/double-conversion/fixed-dtoa.cc b/libazure/src/mfbt/double-conversion/fixed-dtoa.cc
similarity index 100%
rename from src/mfbt/double-conversion/fixed-dtoa.cc
rename to libazure/src/mfbt/double-conversion/fixed-dtoa.cc
diff --git a/src/mfbt/double-conversion/fixed-dtoa.h b/libazure/src/mfbt/double-conversion/fixed-dtoa.h
similarity index 100%
rename from src/mfbt/double-conversion/fixed-dtoa.h
rename to libazure/src/mfbt/double-conversion/fixed-dtoa.h
diff --git a/src/mfbt/double-conversion/ieee.h b/libazure/src/mfbt/double-conversion/ieee.h
similarity index 100%
rename from src/mfbt/double-conversion/ieee.h
rename to libazure/src/mfbt/double-conversion/ieee.h
diff --git a/src/mfbt/double-conversion/strtod.cc b/libazure/src/mfbt/double-conversion/strtod.cc
similarity index 100%
rename from src/mfbt/double-conversion/strtod.cc
rename to libazure/src/mfbt/double-conversion/strtod.cc
diff --git a/src/mfbt/double-conversion/strtod.h b/libazure/src/mfbt/double-conversion/strtod.h
similarity index 100%
rename from src/mfbt/double-conversion/strtod.h
rename to libazure/src/mfbt/double-conversion/strtod.h
diff --git a/src/mfbt/double-conversion/update.sh b/libazure/src/mfbt/double-conversion/update.sh
similarity index 100%
rename from src/mfbt/double-conversion/update.sh
rename to libazure/src/mfbt/double-conversion/update.sh
diff --git a/src/mfbt/double-conversion/use-StandardInteger.patch b/libazure/src/mfbt/double-conversion/use-StandardInteger.patch
similarity index 100%
rename from src/mfbt/double-conversion/use-StandardInteger.patch
rename to libazure/src/mfbt/double-conversion/use-StandardInteger.patch
diff --git a/src/mfbt/double-conversion/utils.h b/libazure/src/mfbt/double-conversion/utils.h
similarity index 100%
rename from src/mfbt/double-conversion/utils.h
rename to libazure/src/mfbt/double-conversion/utils.h
diff --git a/src/mfbt/exported_headers.mk b/libazure/src/mfbt/exported_headers.mk
similarity index 100%
rename from src/mfbt/exported_headers.mk
rename to libazure/src/mfbt/exported_headers.mk
diff --git a/src/mfbt/moz.build b/libazure/src/mfbt/moz.build
similarity index 100%
rename from src/mfbt/moz.build
rename to libazure/src/mfbt/moz.build
diff --git a/src/mfbt/sources.mk b/libazure/src/mfbt/sources.mk
similarity index 100%
rename from src/mfbt/sources.mk
rename to libazure/src/mfbt/sources.mk
diff --git a/src/mfbt/tests/Makefile.in b/libazure/src/mfbt/tests/Makefile.in
similarity index 100%
rename from src/mfbt/tests/Makefile.in
rename to libazure/src/mfbt/tests/Makefile.in
diff --git a/src/mfbt/tests/TestBloomFilter.cpp b/libazure/src/mfbt/tests/TestBloomFilter.cpp
similarity index 100%
rename from src/mfbt/tests/TestBloomFilter.cpp
rename to libazure/src/mfbt/tests/TestBloomFilter.cpp
diff --git a/src/mfbt/tests/TestCheckedInt.cpp b/libazure/src/mfbt/tests/TestCheckedInt.cpp
similarity index 100%
rename from src/mfbt/tests/TestCheckedInt.cpp
rename to libazure/src/mfbt/tests/TestCheckedInt.cpp
diff --git a/src/mfbt/tests/TestEndian.cpp b/libazure/src/mfbt/tests/TestEndian.cpp
similarity index 100%
rename from src/mfbt/tests/TestEndian.cpp
rename to libazure/src/mfbt/tests/TestEndian.cpp
diff --git a/src/mfbt/tests/TestEnumSet.cpp b/libazure/src/mfbt/tests/TestEnumSet.cpp
similarity index 100%
rename from src/mfbt/tests/TestEnumSet.cpp
rename to libazure/src/mfbt/tests/TestEnumSet.cpp
diff --git a/src/mfbt/tests/TestSHA1.cpp b/libazure/src/mfbt/tests/TestSHA1.cpp
similarity index 100%
rename from src/mfbt/tests/TestSHA1.cpp
rename to libazure/src/mfbt/tests/TestSHA1.cpp
diff --git a/src/mfbt/tests/TestTypeTraits.cpp b/libazure/src/mfbt/tests/TestTypeTraits.cpp
similarity index 100%
rename from src/mfbt/tests/TestTypeTraits.cpp
rename to libazure/src/mfbt/tests/TestTypeTraits.cpp
diff --git a/src/mfbt/tests/TestWeakPtr.cpp b/libazure/src/mfbt/tests/TestWeakPtr.cpp
similarity index 100%
rename from src/mfbt/tests/TestWeakPtr.cpp
rename to libazure/src/mfbt/tests/TestWeakPtr.cpp
diff --git a/src/mfbt/tests/moz.build b/libazure/src/mfbt/tests/moz.build
similarity index 100%
rename from src/mfbt/tests/moz.build
rename to libazure/src/mfbt/tests/moz.build
diff --git a/makefile.cargo b/makefile.cargo
new file mode 100644
index 0000000..0fad398
--- /dev/null
+++ b/makefile.cargo
@@ -0,0 +1,162 @@
+CC ?= gcc
+CXX ?= g++
+CXXFLAGS ?=
+AR ?= ar
+
+
+ifeq (darwin,$(findstring darwin,$(TARGET)))
+    OSTYPE=darwin
+endif
+ifeq (linux,$(findstring linux,$(TARGET)))
+    OSTYPE=linux
+endif
+ifeq (androideabi,$(findstring androideabi,$(TARGET)))
+    OSTYPE=android
+endif
+
+MOZALLOC_CPP_SRC = \
+	libazure/src/memory/mozalloc/mozalloc_abort.cpp \
+	libazure/src/memory/mozalloc/mozalloc.cpp \
+	libazure/src/memory/mozalloc/mozalloc_oom.cpp \
+	$(NULL)
+
+AZURE_CPP_SRC = \
+	$(addprefix libazure/src/gfx/2d/,\
+		Blur.cpp \
+		DrawEventRecorder.cpp \
+		DrawTargetRecording.cpp \
+		Factory.cpp \
+		ImageScaling.cpp \
+		Matrix.cpp \
+		PathRecording.cpp \
+		RecordedEvent.cpp \
+		Rect.cpp \
+		Scale.cpp \
+		ScaledFontBase.cpp \
+		SourceSurfaceRawData.cpp \
+		convolver.cpp \
+		image_operations.cpp)
+
+ifneq (arm,$(findstring arm,$(TARGET)))
+    AZURE_CPP_SRC += $(addprefix libazure/src/gfx/2d/, ImageScalingSSE2.cpp)
+endif
+AZURE_CPP_SRC += src/azure-c.cpp
+
+ifeq ($(CFG_ENABLE_DEBUG_SKIA),1)
+CXXFLAGS += \
+	-g \
+	-DSK_DEBUG \
+	-DGR_DEBUG=1 \
+	-DGR_GL_LOG_CALLS=1 \
+	-DGR_GL_LOG_CALLS_START=1 \
+	$(NULL)
+else
+CXXFLAGS += \
+	-O3 \
+	-DSK_RELEASE \
+	-DGR_RELEASE=1 \
+	$(NULL)
+endif
+
+#SSE2 instruction support required.
+CXXFLAGS += \
+	-fPIC \
+	-Ilibazure/include \
+	-Ilibazure/include/mozilla/gfx \
+	-Ilibazure/include/mozilla/ipc/chromium/src \
+	-Ilibazure/include/mozilla/xpcom/base \
+	-Ilibazure/include/mozilla/xpcom/build \
+	-Ilibazure/include/mozilla/xpcom/glue \
+	-Ilibazure/include/mozilla/xpcom/string/public \
+	-DMOZ_GFX \
+	-DNS_ATTR_MALLOC="" -DNS_WARN_UNUSED_RESULT="" \
+	$(NULL)
+
+#SSE2 instruction support required.
+ifneq (arm,$(findstring arm,$(TARGET)))
+    CXXFLAGS += -msse2
+endif
+
+AZURE_CPP_SRC += \
+	$(addprefix libazure/src/gfx/2d/,\
+		DrawTargetSkia.cpp \
+		PathSkia.cpp \
+		SourceSurfaceSkia.cpp)
+
+SKIA_OUTDIR = $(shell find $(OUT_DIR)/.. -name 'skia-sys-*' -type d)
+CXXFLAGS += \
+	-iquote $(SKIA_OUTDIR)/include/core \
+	-iquote $(SKIA_OUTDIR)/include/config \
+	-iquote $(SKIA_OUTDIR)/include/effects \
+	-iquote $(SKIA_OUTDIR)/include/ports \
+	-iquote $(SKIA_OUTDIR)/include/utils \
+	-iquote $(SKIA_OUTDIR)/include/gpu \
+	-iquote $(SKIA_OUTDIR)/include/gpu/gl \
+	-DUSE_SKIA \
+	-DUSE_SKIA_GPU \
+	$(NULL)
+
+USE_CLANG = $(shell $(CXX) --version|grep -c 'clang')
+
+ifeq ($(USE_CLANG),1)
+    CXXFLAGS += -Wno-c++11-extensions
+endif
+
+ifeq ($(OSTYPE),darwin)
+CXXFLAGS += \
+	-DXP_MACOSX \
+	-DXP_UNIX \
+	-DMALLOC_H="<malloc/malloc.h>" \
+	-Ilibazure/include/mozilla/gfx/gl \
+	$(NULL)
+
+AZURE_CPP_SRC += \
+	libazure/src/gfx/2d/ScaledFontMac.cpp \
+	libazure/src/gfx/2d/DrawTargetCG.cpp \
+	libazure/src/gfx/2d/PathCG.cpp \
+	libazure/src/gfx/2d/SourceSurfaceCG.cpp \
+	$(NULL)
+
+AZURE_OBJCPP_SRC = libazure/src/gfx/2d/QuartzSupport.mm
+endif
+
+ifeq ($(OSTYPE),linux)
+CXXFLAGS += \
+	-DXP_UNIX \
+	$(NULL)
+AZURE_OBJCPP_SRC =
+
+CXXFLAGS += -DMOZ_ENABLE_FREETYPE
+AZURE_CPP_SRC += \
+	$(addprefix libazure/src/gfx/2d/,\
+		ScaledFontFreetype.cpp)
+endif
+
+ifeq ($(OSTYPE),android)
+    CXXFLAGS += \
+    -DXP_UNIX \
+    -DSK_BUILD_FOR_ANDROID \
+    $(NULL)
+    AZURE_OBJCPP_SRC =
+
+    CXXFLAGS += -DMOZ_ENABLE_FREETYPE
+    AZURE_CPP_SRC += \
+        $(addprefix libazure/src/gfx/2d/,\
+            ScaledFontFreetype.cpp)
+endif
+
+ALL_CPP_SRC = $(MOZALLOC_CPP_SRC) $(AZURE_CPP_SRC)
+ALL_OBJCPP_SRC = $(AZURE_OBJCPP_SRC)
+ALL_OBJS = $(ALL_CPP_SRC:%.cpp=$(OUT_DIR)/%.o) $(ALL_OBJCPP_SRC:%.mm=$(OUT_DIR)/%.o)
+
+.PHONY: all
+all: $(OUT_DIR)/libazure.a
+
+$(OUT_DIR)/%.o: %.cpp
+	mkdir -p `dirname $@` && $(CXX) $< -o $@ -c $(CXXFLAGS)
+
+$(OUT_DIR)/%.o: %.mm
+	mkdir -p `dirname $@` && $(CXX) -ObjC++ $< -o $@ -c $(CXXFLAGS)
+
+$(OUT_DIR)/libazure.a: $(ALL_OBJS)
+	$(AR) rcs $@ $(ALL_OBJS)
diff --git a/azure-c.cpp b/src/azure-c.cpp
similarity index 100%
rename from azure-c.cpp
rename to src/azure-c.cpp
diff --git a/azure-c.h b/src/azure-c.h
similarity index 100%
rename from azure-c.h
rename to src/azure-c.h
diff --git a/azure.rs b/src/azure.rs
similarity index 100%
rename from azure.rs
rename to src/azure.rs
diff --git a/azure_hl.rs b/src/azure_hl.rs
similarity index 100%
rename from azure_hl.rs
rename to src/azure_hl.rs
diff --git a/azure.rc b/src/lib.rs
similarity index 96%
rename from azure.rc
rename to src/lib.rs
index c00b5bf..0eab8dc 100644
--- a/azure.rc
+++ b/src/lib.rs
@@ -21,6 +21,14 @@ extern crate xlib;
 extern crate egl;
 #[cfg(not(target_os = "android"))]
 extern crate glfw;
+#[cfg(not(target_os = "macos"))]
+extern crate freetype;
+#[cfg(target_os = "macos")]
+extern crate core_foundation;
+#[cfg(target_os = "macos")]
+extern crate core_graphics;
+#[cfg(target_os = "macos")]
+extern crate core_text;
 
 pub use azure::{AzFontOptions, AzFloat, enum_AzSurfaceType, AZ_SURFACE_DATA, 
                 AZ_SURFACE_D2D1_BITMAP, AZ_SURFACE_D2D1_DRAWTARGET, AZ_SURFACE_CAIRO, AZ_SURFACE_CAIRO_IMAGE, 
diff --git a/linkhack.rs b/src/linkhack.rs
similarity index 100%
rename from linkhack.rs
rename to src/linkhack.rs
diff --git a/scaled_font.rs b/src/scaled_font.rs
similarity index 96%
rename from scaled_font.rs
rename to src/scaled_font.rs
index 390d4b5..a2be4a1 100644
--- a/scaled_font.rs
+++ b/src/scaled_font.rs
@@ -23,25 +23,17 @@ use scaled_font::android::*;
 
 #[cfg(target_os="macos")]
 pub mod macos {
-    extern crate core_foundation;
-    extern crate core_graphics;
-    extern crate core_text;
-
     pub use scaled_font::macos::core_text::font::CTFontRef;
     pub use scaled_font::macos::core_graphics::font::{CGFont, CGFontRef};
 }
 
 #[cfg(target_os="linux")]
 pub mod linux {
-    extern crate freetype;
-
     pub use scaled_font::linux::freetype::freetype::{FT_Face, FT_LOAD_DEFAULT};
 }
 
 #[cfg(target_os="android")]
 pub mod android {
-    extern crate freetype;
-
     pub use scaled_font::android::freetype::freetype::{FT_Face, FT_LOAD_DEFAULT};
 }
 
diff --git a/test.rs b/src/test.rs
similarity index 100%
rename from test.rs
rename to src/test.rs
diff --git a/test.cpp b/test.cpp
deleted file mode 100644
index fe5a6f6..0000000
--- a/test.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include <assert.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <X11/Xlib.h>
-//#include "xcb/xcb.h"
-#include "cairo/cairo.h"
-#include "cairo/cairo-xlib.h"
-#include "mozilla/gfx/2D.h"
-
-/*int main() {
-  xcb_connection_t *connection = xcb_connect(NULL, NULL);
-  const xcb_setup_t *setup = xcb_get_setup(connection);
-  xcb_screen_iterator_t iter = xcb_setup_roots_iterator(setup);
-  xcb_screen_t *screen = iter.data;
-
-  xcb_window_t window = xcb_generate_id(connection);
-  xcb_create_window(connection,
-                    XCB_COPY_FROM_PARENT,
-                    window,
-                    screen->root,
-                    0, 0,
-                    150, 150,
-                    10,
-                    XCB_WINDOW_CLASS_INPUT_OUTPUT,
-                    screen->root_visual,
-                    0, NULL);
-
-  xcb_map_window(connection, window);
-  xcb_flush(connection);
-
-  pause();
-  xcb_disconnect(connection);
-
-  return 0;
-}
-*/
-
-#define SIZEX 400
-#define SIZEY 400
-
-void paint(cairo_surface_t *cs) {
-    cairo_t *c;
-    c = cairo_create(cs);
-    cairo_rectangle(c, 0.0, 0.0, SIZEX, SIZEY);
-    cairo_set_source_rgb(c, 0.0, 0.0, 0.5);
-    cairo_fill(c);
-}
-
-using namespace mozilla;
-using namespace mozilla::gfx;
-
-void paint3() { }
-
-void paint2(RefPtr<DrawTarget> drawTarget) {
-    Rect rect = Rect(50, 50, 200, 200);
-    ColorPattern pattern = ColorPattern(Color(0.0, 0.5, 0.0));
-    drawTarget->FillRect(rect, pattern);
-}
-
-int main() {
-    Display *dpy;
-    Window rootwin;
-    Window win;
-    XEvent e;
-    int scr;
-    cairo_surface_t *cs;
-
-    dpy = XOpenDisplay(NULL);
-    assert(dpy);
-
-    scr = DefaultScreen(dpy);
-    rootwin = RootWindow(dpy, scr);
-    win = XCreateSimpleWindow(dpy, rootwin, 1, 1, SIZEX, SIZEY, 0,
-			      BlackPixel(dpy, scr), BlackPixel(dpy, scr));
-
-    XStoreName(dpy, win, "test");
-    XSelectInput(dpy, win, ExposureMask | ButtonPressMask);
-    XMapWindow(dpy, win);
-
-    cs = cairo_xlib_surface_create(dpy, win, DefaultVisual(dpy, 0), SIZEX, SIZEY);
-
-    RefPtr<DrawTarget> dt = Factory::CreateDrawTargetForCairoSurface(cs);
-
-    while(1) {
-	XNextEvent(dpy, &e);
-	if (e.type==Expose && e.xexpose.count<1) {
-	    //paint(cs);
-	    paint2(dt);
-	} else if (e.type==ButtonPress) break;
-    }
-
-    cairo_surface_destroy(cs);
-    XCloseDisplay(dpy);
-
-    return 0;
-}