diff --git a/src/AbstractFramebuffer.cpp b/src/Magnum/AbstractFramebuffer.cpp
similarity index 100%
rename from src/AbstractFramebuffer.cpp
rename to src/Magnum/AbstractFramebuffer.cpp
diff --git a/src/AbstractFramebuffer.h b/src/Magnum/AbstractFramebuffer.h
similarity index 100%
rename from src/AbstractFramebuffer.h
rename to src/Magnum/AbstractFramebuffer.h
diff --git a/src/AbstractImage.cpp b/src/Magnum/AbstractImage.cpp
similarity index 100%
rename from src/AbstractImage.cpp
rename to src/Magnum/AbstractImage.cpp
diff --git a/src/AbstractImage.h b/src/Magnum/AbstractImage.h
similarity index 100%
rename from src/AbstractImage.h
rename to src/Magnum/AbstractImage.h
diff --git a/src/AbstractObject.cpp b/src/Magnum/AbstractObject.cpp
similarity index 100%
rename from src/AbstractObject.cpp
rename to src/Magnum/AbstractObject.cpp
diff --git a/src/AbstractObject.h b/src/Magnum/AbstractObject.h
similarity index 100%
rename from src/AbstractObject.h
rename to src/Magnum/AbstractObject.h
diff --git a/src/AbstractResourceLoader.h b/src/Magnum/AbstractResourceLoader.h
similarity index 100%
rename from src/AbstractResourceLoader.h
rename to src/Magnum/AbstractResourceLoader.h
diff --git a/src/AbstractShaderProgram.cpp b/src/Magnum/AbstractShaderProgram.cpp
similarity index 100%
rename from src/AbstractShaderProgram.cpp
rename to src/Magnum/AbstractShaderProgram.cpp
diff --git a/src/AbstractShaderProgram.h b/src/Magnum/AbstractShaderProgram.h
similarity index 100%
rename from src/AbstractShaderProgram.h
rename to src/Magnum/AbstractShaderProgram.h
diff --git a/src/AbstractTexture.cpp b/src/Magnum/AbstractTexture.cpp
similarity index 100%
rename from src/AbstractTexture.cpp
rename to src/Magnum/AbstractTexture.cpp
diff --git a/src/AbstractTexture.h b/src/Magnum/AbstractTexture.h
similarity index 100%
rename from src/AbstractTexture.h
rename to src/Magnum/AbstractTexture.h
diff --git a/src/Array.h b/src/Magnum/Array.h
similarity index 100%
rename from src/Array.h
rename to src/Magnum/Array.h
diff --git a/src/Audio/AbstractImporter.cpp b/src/Magnum/Audio/AbstractImporter.cpp
similarity index 100%
rename from src/Audio/AbstractImporter.cpp
rename to src/Magnum/Audio/AbstractImporter.cpp
diff --git a/src/Audio/AbstractImporter.h b/src/Magnum/Audio/AbstractImporter.h
similarity index 100%
rename from src/Audio/AbstractImporter.h
rename to src/Magnum/Audio/AbstractImporter.h
diff --git a/src/Audio/Audio.cpp b/src/Magnum/Audio/Audio.cpp
similarity index 100%
rename from src/Audio/Audio.cpp
rename to src/Magnum/Audio/Audio.cpp
diff --git a/src/Audio/Audio.h b/src/Magnum/Audio/Audio.h
similarity index 100%
rename from src/Audio/Audio.h
rename to src/Magnum/Audio/Audio.h
diff --git a/src/Audio/Buffer.cpp b/src/Magnum/Audio/Buffer.cpp
similarity index 100%
rename from src/Audio/Buffer.cpp
rename to src/Magnum/Audio/Buffer.cpp
diff --git a/src/Audio/Buffer.h b/src/Magnum/Audio/Buffer.h
similarity index 100%
rename from src/Audio/Buffer.h
rename to src/Magnum/Audio/Buffer.h
diff --git a/src/Audio/CMakeLists.txt b/src/Magnum/Audio/CMakeLists.txt
similarity index 100%
rename from src/Audio/CMakeLists.txt
rename to src/Magnum/Audio/CMakeLists.txt
diff --git a/src/Audio/Context.cpp b/src/Magnum/Audio/Context.cpp
similarity index 100%
rename from src/Audio/Context.cpp
rename to src/Magnum/Audio/Context.cpp
diff --git a/src/Audio/Context.h b/src/Magnum/Audio/Context.h
similarity index 100%
rename from src/Audio/Context.h
rename to src/Magnum/Audio/Context.h
diff --git a/src/Audio/Renderer.cpp b/src/Magnum/Audio/Renderer.cpp
similarity index 100%
rename from src/Audio/Renderer.cpp
rename to src/Magnum/Audio/Renderer.cpp
diff --git a/src/Audio/Renderer.h b/src/Magnum/Audio/Renderer.h
similarity index 100%
rename from src/Audio/Renderer.h
rename to src/Magnum/Audio/Renderer.h
diff --git a/src/Audio/Source.cpp b/src/Magnum/Audio/Source.cpp
similarity index 100%
rename from src/Audio/Source.cpp
rename to src/Magnum/Audio/Source.cpp
diff --git a/src/Audio/Source.h b/src/Magnum/Audio/Source.h
similarity index 100%
rename from src/Audio/Source.h
rename to src/Magnum/Audio/Source.h
diff --git a/src/Audio/Test/AbstractImporterTest.cpp b/src/Magnum/Audio/Test/AbstractImporterTest.cpp
similarity index 100%
rename from src/Audio/Test/AbstractImporterTest.cpp
rename to src/Magnum/Audio/Test/AbstractImporterTest.cpp
diff --git a/src/Audio/Test/BufferTest.cpp b/src/Magnum/Audio/Test/BufferTest.cpp
similarity index 100%
rename from src/Audio/Test/BufferTest.cpp
rename to src/Magnum/Audio/Test/BufferTest.cpp
diff --git a/src/Audio/Test/CMakeLists.txt b/src/Magnum/Audio/Test/CMakeLists.txt
similarity index 100%
rename from src/Audio/Test/CMakeLists.txt
rename to src/Magnum/Audio/Test/CMakeLists.txt
diff --git a/src/Audio/Test/RendererTest.cpp b/src/Magnum/Audio/Test/RendererTest.cpp
similarity index 100%
rename from src/Audio/Test/RendererTest.cpp
rename to src/Magnum/Audio/Test/RendererTest.cpp
diff --git a/src/Audio/Test/SourceTest.cpp b/src/Magnum/Audio/Test/SourceTest.cpp
similarity index 100%
rename from src/Audio/Test/SourceTest.cpp
rename to src/Magnum/Audio/Test/SourceTest.cpp
diff --git a/src/Audio/Test/file.bin b/src/Magnum/Audio/Test/file.bin
similarity index 100%
rename from src/Audio/Test/file.bin
rename to src/Magnum/Audio/Test/file.bin
diff --git a/src/Audio/Test/testConfigure.h.cmake b/src/Magnum/Audio/Test/testConfigure.h.cmake
similarity index 100%
rename from src/Audio/Test/testConfigure.h.cmake
rename to src/Magnum/Audio/Test/testConfigure.h.cmake
diff --git a/src/Audio/magnumAudioVisibility.h b/src/Magnum/Audio/magnumAudioVisibility.h
similarity index 100%
rename from src/Audio/magnumAudioVisibility.h
rename to src/Magnum/Audio/magnumAudioVisibility.h
diff --git a/src/Buffer.cpp b/src/Magnum/Buffer.cpp
similarity index 100%
rename from src/Buffer.cpp
rename to src/Magnum/Buffer.cpp
diff --git a/src/Buffer.h b/src/Magnum/Buffer.h
similarity index 100%
rename from src/Buffer.h
rename to src/Magnum/Buffer.h
diff --git a/src/BufferImage.cpp b/src/Magnum/BufferImage.cpp
similarity index 100%
rename from src/BufferImage.cpp
rename to src/Magnum/BufferImage.cpp
diff --git a/src/BufferImage.h b/src/Magnum/BufferImage.h
similarity index 100%
rename from src/BufferImage.h
rename to src/Magnum/BufferImage.h
diff --git a/src/BufferTexture.cpp b/src/Magnum/BufferTexture.cpp
similarity index 100%
rename from src/BufferTexture.cpp
rename to src/Magnum/BufferTexture.cpp
diff --git a/src/BufferTexture.h b/src/Magnum/BufferTexture.h
similarity index 100%
rename from src/BufferTexture.h
rename to src/Magnum/BufferTexture.h
diff --git a/src/CMakeLists.txt b/src/Magnum/CMakeLists.txt
similarity index 100%
rename from src/CMakeLists.txt
rename to src/Magnum/CMakeLists.txt
diff --git a/src/Color.h b/src/Magnum/Color.h
similarity index 100%
rename from src/Color.h
rename to src/Magnum/Color.h
diff --git a/src/ColorFormat.cpp b/src/Magnum/ColorFormat.cpp
similarity index 100%
rename from src/ColorFormat.cpp
rename to src/Magnum/ColorFormat.cpp
diff --git a/src/ColorFormat.h b/src/Magnum/ColorFormat.h
similarity index 100%
rename from src/ColorFormat.h
rename to src/Magnum/ColorFormat.h
diff --git a/src/Context.cpp b/src/Magnum/Context.cpp
similarity index 100%
rename from src/Context.cpp
rename to src/Magnum/Context.cpp
diff --git a/src/Context.h b/src/Magnum/Context.h
similarity index 100%
rename from src/Context.h
rename to src/Magnum/Context.h
diff --git a/src/CubeMapTexture.h b/src/Magnum/CubeMapTexture.h
similarity index 100%
rename from src/CubeMapTexture.h
rename to src/Magnum/CubeMapTexture.h
diff --git a/src/CubeMapTextureArray.h b/src/Magnum/CubeMapTextureArray.h
similarity index 100%
rename from src/CubeMapTextureArray.h
rename to src/Magnum/CubeMapTextureArray.h
diff --git a/src/DebugMarker.h b/src/Magnum/DebugMarker.h
similarity index 100%
rename from src/DebugMarker.h
rename to src/Magnum/DebugMarker.h
diff --git a/src/DebugMessage.cpp b/src/Magnum/DebugMessage.cpp
similarity index 100%
rename from src/DebugMessage.cpp
rename to src/Magnum/DebugMessage.cpp
diff --git a/src/DebugMessage.h b/src/Magnum/DebugMessage.h
similarity index 100%
rename from src/DebugMessage.h
rename to src/Magnum/DebugMessage.h
diff --git a/src/DebugTools/CMakeLists.txt b/src/Magnum/DebugTools/CMakeLists.txt
similarity index 100%
rename from src/DebugTools/CMakeLists.txt
rename to src/Magnum/DebugTools/CMakeLists.txt
diff --git a/src/DebugTools/DebugTools.h b/src/Magnum/DebugTools/DebugTools.h
similarity index 100%
rename from src/DebugTools/DebugTools.h
rename to src/Magnum/DebugTools/DebugTools.h
diff --git a/src/DebugTools/ForceRenderer.cpp b/src/Magnum/DebugTools/ForceRenderer.cpp
similarity index 100%
rename from src/DebugTools/ForceRenderer.cpp
rename to src/Magnum/DebugTools/ForceRenderer.cpp
diff --git a/src/DebugTools/ForceRenderer.h b/src/Magnum/DebugTools/ForceRenderer.h
similarity index 100%
rename from src/DebugTools/ForceRenderer.h
rename to src/Magnum/DebugTools/ForceRenderer.h
diff --git a/src/DebugTools/Implementation/AbstractBoxRenderer.cpp b/src/Magnum/DebugTools/Implementation/AbstractBoxRenderer.cpp
similarity index 100%
rename from src/DebugTools/Implementation/AbstractBoxRenderer.cpp
rename to src/Magnum/DebugTools/Implementation/AbstractBoxRenderer.cpp
diff --git a/src/DebugTools/Implementation/AbstractBoxRenderer.h b/src/Magnum/DebugTools/Implementation/AbstractBoxRenderer.h
similarity index 100%
rename from src/DebugTools/Implementation/AbstractBoxRenderer.h
rename to src/Magnum/DebugTools/Implementation/AbstractBoxRenderer.h
diff --git a/src/DebugTools/Implementation/AbstractShapeRenderer.cpp b/src/Magnum/DebugTools/Implementation/AbstractShapeRenderer.cpp
similarity index 100%
rename from src/DebugTools/Implementation/AbstractShapeRenderer.cpp
rename to src/Magnum/DebugTools/Implementation/AbstractShapeRenderer.cpp
diff --git a/src/DebugTools/Implementation/AbstractShapeRenderer.h b/src/Magnum/DebugTools/Implementation/AbstractShapeRenderer.h
similarity index 100%
rename from src/DebugTools/Implementation/AbstractShapeRenderer.h
rename to src/Magnum/DebugTools/Implementation/AbstractShapeRenderer.h
diff --git a/src/DebugTools/Implementation/AxisAlignedBoxRenderer.cpp b/src/Magnum/DebugTools/Implementation/AxisAlignedBoxRenderer.cpp
similarity index 100%
rename from src/DebugTools/Implementation/AxisAlignedBoxRenderer.cpp
rename to src/Magnum/DebugTools/Implementation/AxisAlignedBoxRenderer.cpp
diff --git a/src/DebugTools/Implementation/AxisAlignedBoxRenderer.h b/src/Magnum/DebugTools/Implementation/AxisAlignedBoxRenderer.h
similarity index 100%
rename from src/DebugTools/Implementation/AxisAlignedBoxRenderer.h
rename to src/Magnum/DebugTools/Implementation/AxisAlignedBoxRenderer.h
diff --git a/src/DebugTools/Implementation/BoxRenderer.cpp b/src/Magnum/DebugTools/Implementation/BoxRenderer.cpp
similarity index 100%
rename from src/DebugTools/Implementation/BoxRenderer.cpp
rename to src/Magnum/DebugTools/Implementation/BoxRenderer.cpp
diff --git a/src/DebugTools/Implementation/BoxRenderer.h b/src/Magnum/DebugTools/Implementation/BoxRenderer.h
similarity index 100%
rename from src/DebugTools/Implementation/BoxRenderer.h
rename to src/Magnum/DebugTools/Implementation/BoxRenderer.h
diff --git a/src/DebugTools/Implementation/CapsuleRenderer.cpp b/src/Magnum/DebugTools/Implementation/CapsuleRenderer.cpp
similarity index 100%
rename from src/DebugTools/Implementation/CapsuleRenderer.cpp
rename to src/Magnum/DebugTools/Implementation/CapsuleRenderer.cpp
diff --git a/src/DebugTools/Implementation/CapsuleRenderer.h b/src/Magnum/DebugTools/Implementation/CapsuleRenderer.h
similarity index 100%
rename from src/DebugTools/Implementation/CapsuleRenderer.h
rename to src/Magnum/DebugTools/Implementation/CapsuleRenderer.h
diff --git a/src/DebugTools/Implementation/CapsuleRendererTransformation.h b/src/Magnum/DebugTools/Implementation/CapsuleRendererTransformation.h
similarity index 100%
rename from src/DebugTools/Implementation/CapsuleRendererTransformation.h
rename to src/Magnum/DebugTools/Implementation/CapsuleRendererTransformation.h
diff --git a/src/DebugTools/Implementation/CylinderRenderer.cpp b/src/Magnum/DebugTools/Implementation/CylinderRenderer.cpp
similarity index 100%
rename from src/DebugTools/Implementation/CylinderRenderer.cpp
rename to src/Magnum/DebugTools/Implementation/CylinderRenderer.cpp
diff --git a/src/DebugTools/Implementation/CylinderRenderer.h b/src/Magnum/DebugTools/Implementation/CylinderRenderer.h
similarity index 100%
rename from src/DebugTools/Implementation/CylinderRenderer.h
rename to src/Magnum/DebugTools/Implementation/CylinderRenderer.h
diff --git a/src/DebugTools/Implementation/CylinderRendererTransformation.h b/src/Magnum/DebugTools/Implementation/CylinderRendererTransformation.h
similarity index 100%
rename from src/DebugTools/Implementation/CylinderRendererTransformation.h
rename to src/Magnum/DebugTools/Implementation/CylinderRendererTransformation.h
diff --git a/src/DebugTools/Implementation/ForceRendererTransformation.h b/src/Magnum/DebugTools/Implementation/ForceRendererTransformation.h
similarity index 100%
rename from src/DebugTools/Implementation/ForceRendererTransformation.h
rename to src/Magnum/DebugTools/Implementation/ForceRendererTransformation.h
diff --git a/src/DebugTools/Implementation/LineSegmentRenderer.cpp b/src/Magnum/DebugTools/Implementation/LineSegmentRenderer.cpp
similarity index 100%
rename from src/DebugTools/Implementation/LineSegmentRenderer.cpp
rename to src/Magnum/DebugTools/Implementation/LineSegmentRenderer.cpp
diff --git a/src/DebugTools/Implementation/LineSegmentRenderer.h b/src/Magnum/DebugTools/Implementation/LineSegmentRenderer.h
similarity index 100%
rename from src/DebugTools/Implementation/LineSegmentRenderer.h
rename to src/Magnum/DebugTools/Implementation/LineSegmentRenderer.h
diff --git a/src/DebugTools/Implementation/LineSegmentRendererTransformation.h b/src/Magnum/DebugTools/Implementation/LineSegmentRendererTransformation.h
similarity index 100%
rename from src/DebugTools/Implementation/LineSegmentRendererTransformation.h
rename to src/Magnum/DebugTools/Implementation/LineSegmentRendererTransformation.h
diff --git a/src/DebugTools/Implementation/PointRenderer.cpp b/src/Magnum/DebugTools/Implementation/PointRenderer.cpp
similarity index 100%
rename from src/DebugTools/Implementation/PointRenderer.cpp
rename to src/Magnum/DebugTools/Implementation/PointRenderer.cpp
diff --git a/src/DebugTools/Implementation/PointRenderer.h b/src/Magnum/DebugTools/Implementation/PointRenderer.h
similarity index 100%
rename from src/DebugTools/Implementation/PointRenderer.h
rename to src/Magnum/DebugTools/Implementation/PointRenderer.h
diff --git a/src/DebugTools/Implementation/SphereRenderer.cpp b/src/Magnum/DebugTools/Implementation/SphereRenderer.cpp
similarity index 100%
rename from src/DebugTools/Implementation/SphereRenderer.cpp
rename to src/Magnum/DebugTools/Implementation/SphereRenderer.cpp
diff --git a/src/DebugTools/Implementation/SphereRenderer.h b/src/Magnum/DebugTools/Implementation/SphereRenderer.h
similarity index 100%
rename from src/DebugTools/Implementation/SphereRenderer.h
rename to src/Magnum/DebugTools/Implementation/SphereRenderer.h
diff --git a/src/DebugTools/ObjectRenderer.cpp b/src/Magnum/DebugTools/ObjectRenderer.cpp
similarity index 100%
rename from src/DebugTools/ObjectRenderer.cpp
rename to src/Magnum/DebugTools/ObjectRenderer.cpp
diff --git a/src/DebugTools/ObjectRenderer.h b/src/Magnum/DebugTools/ObjectRenderer.h
similarity index 100%
rename from src/DebugTools/ObjectRenderer.h
rename to src/Magnum/DebugTools/ObjectRenderer.h
diff --git a/src/DebugTools/Profiler.cpp b/src/Magnum/DebugTools/Profiler.cpp
similarity index 100%
rename from src/DebugTools/Profiler.cpp
rename to src/Magnum/DebugTools/Profiler.cpp
diff --git a/src/DebugTools/Profiler.h b/src/Magnum/DebugTools/Profiler.h
similarity index 100%
rename from src/DebugTools/Profiler.h
rename to src/Magnum/DebugTools/Profiler.h
diff --git a/src/DebugTools/ResourceManager.cpp b/src/Magnum/DebugTools/ResourceManager.cpp
similarity index 100%
rename from src/DebugTools/ResourceManager.cpp
rename to src/Magnum/DebugTools/ResourceManager.cpp
diff --git a/src/DebugTools/ResourceManager.h b/src/Magnum/DebugTools/ResourceManager.h
similarity index 100%
rename from src/DebugTools/ResourceManager.h
rename to src/Magnum/DebugTools/ResourceManager.h
diff --git a/src/DebugTools/ShapeRenderer.cpp b/src/Magnum/DebugTools/ShapeRenderer.cpp
similarity index 100%
rename from src/DebugTools/ShapeRenderer.cpp
rename to src/Magnum/DebugTools/ShapeRenderer.cpp
diff --git a/src/DebugTools/ShapeRenderer.h b/src/Magnum/DebugTools/ShapeRenderer.h
similarity index 100%
rename from src/DebugTools/ShapeRenderer.h
rename to src/Magnum/DebugTools/ShapeRenderer.h
diff --git a/src/DebugTools/Test/CMakeLists.txt b/src/Magnum/DebugTools/Test/CMakeLists.txt
similarity index 100%
rename from src/DebugTools/Test/CMakeLists.txt
rename to src/Magnum/DebugTools/Test/CMakeLists.txt
diff --git a/src/DebugTools/Test/CapsuleRendererTest.cpp b/src/Magnum/DebugTools/Test/CapsuleRendererTest.cpp
similarity index 100%
rename from src/DebugTools/Test/CapsuleRendererTest.cpp
rename to src/Magnum/DebugTools/Test/CapsuleRendererTest.cpp
diff --git a/src/DebugTools/Test/CylinderRendererTest.cpp b/src/Magnum/DebugTools/Test/CylinderRendererTest.cpp
similarity index 100%
rename from src/DebugTools/Test/CylinderRendererTest.cpp
rename to src/Magnum/DebugTools/Test/CylinderRendererTest.cpp
diff --git a/src/DebugTools/Test/ForceRendererTest.cpp b/src/Magnum/DebugTools/Test/ForceRendererTest.cpp
similarity index 100%
rename from src/DebugTools/Test/ForceRendererTest.cpp
rename to src/Magnum/DebugTools/Test/ForceRendererTest.cpp
diff --git a/src/DebugTools/Test/LineSegmentRendererTest.cpp b/src/Magnum/DebugTools/Test/LineSegmentRendererTest.cpp
similarity index 100%
rename from src/DebugTools/Test/LineSegmentRendererTest.cpp
rename to src/Magnum/DebugTools/Test/LineSegmentRendererTest.cpp
diff --git a/src/DebugTools/magnumDebugToolsVisibility.h b/src/Magnum/DebugTools/magnumDebugToolsVisibility.h
similarity index 100%
rename from src/DebugTools/magnumDebugToolsVisibility.h
rename to src/Magnum/DebugTools/magnumDebugToolsVisibility.h
diff --git a/src/DefaultFramebuffer.cpp b/src/Magnum/DefaultFramebuffer.cpp
similarity index 100%
rename from src/DefaultFramebuffer.cpp
rename to src/Magnum/DefaultFramebuffer.cpp
diff --git a/src/DefaultFramebuffer.h b/src/Magnum/DefaultFramebuffer.h
similarity index 100%
rename from src/DefaultFramebuffer.h
rename to src/Magnum/DefaultFramebuffer.h
diff --git a/src/DimensionTraits.h b/src/Magnum/DimensionTraits.h
similarity index 100%
rename from src/DimensionTraits.h
rename to src/Magnum/DimensionTraits.h
diff --git a/src/Extensions.h b/src/Magnum/Extensions.h
similarity index 100%
rename from src/Extensions.h
rename to src/Magnum/Extensions.h
diff --git a/src/Framebuffer.cpp b/src/Magnum/Framebuffer.cpp
similarity index 100%
rename from src/Framebuffer.cpp
rename to src/Magnum/Framebuffer.cpp
diff --git a/src/Framebuffer.h b/src/Magnum/Framebuffer.h
similarity index 100%
rename from src/Framebuffer.h
rename to src/Magnum/Framebuffer.h
diff --git a/src/Image.cpp b/src/Magnum/Image.cpp
similarity index 100%
rename from src/Image.cpp
rename to src/Magnum/Image.cpp
diff --git a/src/Image.h b/src/Magnum/Image.h
similarity index 100%
rename from src/Image.h
rename to src/Magnum/Image.h
diff --git a/src/ImageFormat.h b/src/Magnum/ImageFormat.h
similarity index 100%
rename from src/ImageFormat.h
rename to src/Magnum/ImageFormat.h
diff --git a/src/ImageReference.h b/src/Magnum/ImageReference.h
similarity index 100%
rename from src/ImageReference.h
rename to src/Magnum/ImageReference.h
diff --git a/src/Implementation/BufferState.cpp b/src/Magnum/Implementation/BufferState.cpp
similarity index 100%
rename from src/Implementation/BufferState.cpp
rename to src/Magnum/Implementation/BufferState.cpp
diff --git a/src/Implementation/BufferState.h b/src/Magnum/Implementation/BufferState.h
similarity index 100%
rename from src/Implementation/BufferState.h
rename to src/Magnum/Implementation/BufferState.h
diff --git a/src/Implementation/DebugState.cpp b/src/Magnum/Implementation/DebugState.cpp
similarity index 100%
rename from src/Implementation/DebugState.cpp
rename to src/Magnum/Implementation/DebugState.cpp
diff --git a/src/Implementation/DebugState.h b/src/Magnum/Implementation/DebugState.h
similarity index 100%
rename from src/Implementation/DebugState.h
rename to src/Magnum/Implementation/DebugState.h
diff --git a/src/Implementation/FramebufferState.h b/src/Magnum/Implementation/FramebufferState.h
similarity index 100%
rename from src/Implementation/FramebufferState.h
rename to src/Magnum/Implementation/FramebufferState.h
diff --git a/src/Implementation/MeshState.h b/src/Magnum/Implementation/MeshState.h
similarity index 100%
rename from src/Implementation/MeshState.h
rename to src/Magnum/Implementation/MeshState.h
diff --git a/src/Implementation/RendererState.h b/src/Magnum/Implementation/RendererState.h
similarity index 100%
rename from src/Implementation/RendererState.h
rename to src/Magnum/Implementation/RendererState.h
diff --git a/src/Implementation/ShaderProgramState.h b/src/Magnum/Implementation/ShaderProgramState.h
similarity index 100%
rename from src/Implementation/ShaderProgramState.h
rename to src/Magnum/Implementation/ShaderProgramState.h
diff --git a/src/Implementation/ShaderState.h b/src/Magnum/Implementation/ShaderState.h
similarity index 100%
rename from src/Implementation/ShaderState.h
rename to src/Magnum/Implementation/ShaderState.h
diff --git a/src/Implementation/State.cpp b/src/Magnum/Implementation/State.cpp
similarity index 100%
rename from src/Implementation/State.cpp
rename to src/Magnum/Implementation/State.cpp
diff --git a/src/Implementation/State.h b/src/Magnum/Implementation/State.h
similarity index 100%
rename from src/Implementation/State.h
rename to src/Magnum/Implementation/State.h
diff --git a/src/Implementation/TextureState.cpp b/src/Magnum/Implementation/TextureState.cpp
similarity index 100%
rename from src/Implementation/TextureState.cpp
rename to src/Magnum/Implementation/TextureState.cpp
diff --git a/src/Implementation/TextureState.h b/src/Magnum/Implementation/TextureState.h
similarity index 100%
rename from src/Implementation/TextureState.h
rename to src/Magnum/Implementation/TextureState.h
diff --git a/src/Magnum.h b/src/Magnum/Magnum.h
similarity index 100%
rename from src/Magnum.h
rename to src/Magnum/Magnum.h
diff --git a/src/Math/Algorithms/CMakeLists.txt b/src/Magnum/Math/Algorithms/CMakeLists.txt
similarity index 100%
rename from src/Math/Algorithms/CMakeLists.txt
rename to src/Magnum/Math/Algorithms/CMakeLists.txt
diff --git a/src/Math/Algorithms/GaussJordan.h b/src/Magnum/Math/Algorithms/GaussJordan.h
similarity index 100%
rename from src/Math/Algorithms/GaussJordan.h
rename to src/Magnum/Math/Algorithms/GaussJordan.h
diff --git a/src/Math/Algorithms/GramSchmidt.h b/src/Magnum/Math/Algorithms/GramSchmidt.h
similarity index 100%
rename from src/Math/Algorithms/GramSchmidt.h
rename to src/Magnum/Math/Algorithms/GramSchmidt.h
diff --git a/src/Math/Algorithms/Svd.h b/src/Magnum/Math/Algorithms/Svd.h
similarity index 100%
rename from src/Math/Algorithms/Svd.h
rename to src/Magnum/Math/Algorithms/Svd.h
diff --git a/src/Math/Algorithms/Test/CMakeLists.txt b/src/Magnum/Math/Algorithms/Test/CMakeLists.txt
similarity index 100%
rename from src/Math/Algorithms/Test/CMakeLists.txt
rename to src/Magnum/Math/Algorithms/Test/CMakeLists.txt
diff --git a/src/Math/Algorithms/Test/GaussJordanTest.cpp b/src/Magnum/Math/Algorithms/Test/GaussJordanTest.cpp
similarity index 100%
rename from src/Math/Algorithms/Test/GaussJordanTest.cpp
rename to src/Magnum/Math/Algorithms/Test/GaussJordanTest.cpp
diff --git a/src/Math/Algorithms/Test/GramSchmidtTest.cpp b/src/Magnum/Math/Algorithms/Test/GramSchmidtTest.cpp
similarity index 100%
rename from src/Math/Algorithms/Test/GramSchmidtTest.cpp
rename to src/Magnum/Math/Algorithms/Test/GramSchmidtTest.cpp
diff --git a/src/Math/Algorithms/Test/SvdTest.cpp b/src/Magnum/Math/Algorithms/Test/SvdTest.cpp
similarity index 100%
rename from src/Math/Algorithms/Test/SvdTest.cpp
rename to src/Magnum/Math/Algorithms/Test/SvdTest.cpp
diff --git a/src/Math/Angle.h b/src/Magnum/Math/Angle.h
similarity index 100%
rename from src/Math/Angle.h
rename to src/Magnum/Math/Angle.h
diff --git a/src/Math/BoolVector.h b/src/Magnum/Math/BoolVector.h
similarity index 100%
rename from src/Math/BoolVector.h
rename to src/Magnum/Math/BoolVector.h
diff --git a/src/Math/CMakeLists.txt b/src/Magnum/Math/CMakeLists.txt
similarity index 100%
rename from src/Math/CMakeLists.txt
rename to src/Magnum/Math/CMakeLists.txt
diff --git a/src/Math/Complex.h b/src/Magnum/Math/Complex.h
similarity index 100%
rename from src/Math/Complex.h
rename to src/Magnum/Math/Complex.h
diff --git a/src/Math/Constants.h b/src/Magnum/Math/Constants.h
similarity index 100%
rename from src/Math/Constants.h
rename to src/Magnum/Math/Constants.h
diff --git a/src/Math/Dual.h b/src/Magnum/Math/Dual.h
similarity index 100%
rename from src/Math/Dual.h
rename to src/Magnum/Math/Dual.h
diff --git a/src/Math/DualComplex.h b/src/Magnum/Math/DualComplex.h
similarity index 100%
rename from src/Math/DualComplex.h
rename to src/Magnum/Math/DualComplex.h
diff --git a/src/Math/DualQuaternion.h b/src/Magnum/Math/DualQuaternion.h
similarity index 100%
rename from src/Math/DualQuaternion.h
rename to src/Magnum/Math/DualQuaternion.h
diff --git a/src/Math/Functions.cpp b/src/Magnum/Math/Functions.cpp
similarity index 100%
rename from src/Math/Functions.cpp
rename to src/Magnum/Math/Functions.cpp
diff --git a/src/Math/Functions.h b/src/Magnum/Math/Functions.h
similarity index 100%
rename from src/Math/Functions.h
rename to src/Magnum/Math/Functions.h
diff --git a/src/Math/Geometry/CMakeLists.txt b/src/Magnum/Math/Geometry/CMakeLists.txt
similarity index 100%
rename from src/Math/Geometry/CMakeLists.txt
rename to src/Magnum/Math/Geometry/CMakeLists.txt
diff --git a/src/Math/Geometry/Distance.h b/src/Magnum/Math/Geometry/Distance.h
similarity index 100%
rename from src/Math/Geometry/Distance.h
rename to src/Magnum/Math/Geometry/Distance.h
diff --git a/src/Math/Geometry/Intersection.h b/src/Magnum/Math/Geometry/Intersection.h
similarity index 100%
rename from src/Math/Geometry/Intersection.h
rename to src/Magnum/Math/Geometry/Intersection.h
diff --git a/src/Math/Geometry/Rectangle.h b/src/Magnum/Math/Geometry/Rectangle.h
similarity index 100%
rename from src/Math/Geometry/Rectangle.h
rename to src/Magnum/Math/Geometry/Rectangle.h
diff --git a/src/Math/Geometry/Test/CMakeLists.txt b/src/Magnum/Math/Geometry/Test/CMakeLists.txt
similarity index 100%
rename from src/Math/Geometry/Test/CMakeLists.txt
rename to src/Magnum/Math/Geometry/Test/CMakeLists.txt
diff --git a/src/Math/Geometry/Test/DistanceTest.cpp b/src/Magnum/Math/Geometry/Test/DistanceTest.cpp
similarity index 100%
rename from src/Math/Geometry/Test/DistanceTest.cpp
rename to src/Magnum/Math/Geometry/Test/DistanceTest.cpp
diff --git a/src/Math/Geometry/Test/IntersectionTest.cpp b/src/Magnum/Math/Geometry/Test/IntersectionTest.cpp
similarity index 100%
rename from src/Math/Geometry/Test/IntersectionTest.cpp
rename to src/Magnum/Math/Geometry/Test/IntersectionTest.cpp
diff --git a/src/Math/Math.h b/src/Magnum/Math/Math.h
similarity index 100%
rename from src/Math/Math.h
rename to src/Magnum/Math/Math.h
diff --git a/src/Math/Matrix.h b/src/Magnum/Math/Matrix.h
similarity index 100%
rename from src/Math/Matrix.h
rename to src/Magnum/Math/Matrix.h
diff --git a/src/Math/Matrix3.h b/src/Magnum/Math/Matrix3.h
similarity index 100%
rename from src/Math/Matrix3.h
rename to src/Magnum/Math/Matrix3.h
diff --git a/src/Math/Matrix4.h b/src/Magnum/Math/Matrix4.h
similarity index 100%
rename from src/Math/Matrix4.h
rename to src/Magnum/Math/Matrix4.h
diff --git a/src/Math/Quaternion.h b/src/Magnum/Math/Quaternion.h
similarity index 100%
rename from src/Math/Quaternion.h
rename to src/Magnum/Math/Quaternion.h
diff --git a/src/Math/Range.h b/src/Magnum/Math/Range.h
similarity index 100%
rename from src/Math/Range.h
rename to src/Magnum/Math/Range.h
diff --git a/src/Math/RectangularMatrix.h b/src/Magnum/Math/RectangularMatrix.h
similarity index 100%
rename from src/Math/RectangularMatrix.h
rename to src/Magnum/Math/RectangularMatrix.h
diff --git a/src/Math/Swizzle.h b/src/Magnum/Math/Swizzle.h
similarity index 100%
rename from src/Math/Swizzle.h
rename to src/Magnum/Math/Swizzle.h
diff --git a/src/Math/Test/AngleTest.cpp b/src/Magnum/Math/Test/AngleTest.cpp
similarity index 100%
rename from src/Math/Test/AngleTest.cpp
rename to src/Magnum/Math/Test/AngleTest.cpp
diff --git a/src/Math/Test/BoolVectorTest.cpp b/src/Magnum/Math/Test/BoolVectorTest.cpp
similarity index 100%
rename from src/Math/Test/BoolVectorTest.cpp
rename to src/Magnum/Math/Test/BoolVectorTest.cpp
diff --git a/src/Math/Test/CMakeLists.txt b/src/Magnum/Math/Test/CMakeLists.txt
similarity index 100%
rename from src/Math/Test/CMakeLists.txt
rename to src/Magnum/Math/Test/CMakeLists.txt
diff --git a/src/Math/Test/ComplexTest.cpp b/src/Magnum/Math/Test/ComplexTest.cpp
similarity index 100%
rename from src/Math/Test/ComplexTest.cpp
rename to src/Magnum/Math/Test/ComplexTest.cpp
diff --git a/src/Math/Test/ConstantsTest.cpp b/src/Magnum/Math/Test/ConstantsTest.cpp
similarity index 100%
rename from src/Math/Test/ConstantsTest.cpp
rename to src/Magnum/Math/Test/ConstantsTest.cpp
diff --git a/src/Math/Test/DualComplexTest.cpp b/src/Magnum/Math/Test/DualComplexTest.cpp
similarity index 100%
rename from src/Math/Test/DualComplexTest.cpp
rename to src/Magnum/Math/Test/DualComplexTest.cpp
diff --git a/src/Math/Test/DualQuaternionTest.cpp b/src/Magnum/Math/Test/DualQuaternionTest.cpp
similarity index 100%
rename from src/Math/Test/DualQuaternionTest.cpp
rename to src/Magnum/Math/Test/DualQuaternionTest.cpp
diff --git a/src/Math/Test/DualTest.cpp b/src/Magnum/Math/Test/DualTest.cpp
similarity index 100%
rename from src/Math/Test/DualTest.cpp
rename to src/Magnum/Math/Test/DualTest.cpp
diff --git a/src/Math/Test/FunctionsTest.cpp b/src/Magnum/Math/Test/FunctionsTest.cpp
similarity index 100%
rename from src/Math/Test/FunctionsTest.cpp
rename to src/Magnum/Math/Test/FunctionsTest.cpp
diff --git a/src/Math/Test/Matrix3Test.cpp b/src/Magnum/Math/Test/Matrix3Test.cpp
similarity index 100%
rename from src/Math/Test/Matrix3Test.cpp
rename to src/Magnum/Math/Test/Matrix3Test.cpp
diff --git a/src/Math/Test/Matrix4Test.cpp b/src/Magnum/Math/Test/Matrix4Test.cpp
similarity index 100%
rename from src/Math/Test/Matrix4Test.cpp
rename to src/Magnum/Math/Test/Matrix4Test.cpp
diff --git a/src/Math/Test/MatrixTest.cpp b/src/Magnum/Math/Test/MatrixTest.cpp
similarity index 100%
rename from src/Math/Test/MatrixTest.cpp
rename to src/Magnum/Math/Test/MatrixTest.cpp
diff --git a/src/Math/Test/QuaternionTest.cpp b/src/Magnum/Math/Test/QuaternionTest.cpp
similarity index 100%
rename from src/Math/Test/QuaternionTest.cpp
rename to src/Magnum/Math/Test/QuaternionTest.cpp
diff --git a/src/Math/Test/RangeTest.cpp b/src/Magnum/Math/Test/RangeTest.cpp
similarity index 100%
rename from src/Math/Test/RangeTest.cpp
rename to src/Magnum/Math/Test/RangeTest.cpp
diff --git a/src/Math/Test/RectangularMatrixTest.cpp b/src/Magnum/Math/Test/RectangularMatrixTest.cpp
similarity index 100%
rename from src/Math/Test/RectangularMatrixTest.cpp
rename to src/Magnum/Math/Test/RectangularMatrixTest.cpp
diff --git a/src/Math/Test/SwizzleTest.cpp b/src/Magnum/Math/Test/SwizzleTest.cpp
similarity index 100%
rename from src/Math/Test/SwizzleTest.cpp
rename to src/Magnum/Math/Test/SwizzleTest.cpp
diff --git a/src/Math/Test/TypeTraitsTest.cpp b/src/Magnum/Math/Test/TypeTraitsTest.cpp
similarity index 100%
rename from src/Math/Test/TypeTraitsTest.cpp
rename to src/Magnum/Math/Test/TypeTraitsTest.cpp
diff --git a/src/Math/Test/UnitTest.cpp b/src/Magnum/Math/Test/UnitTest.cpp
similarity index 100%
rename from src/Math/Test/UnitTest.cpp
rename to src/Magnum/Math/Test/UnitTest.cpp
diff --git a/src/Math/Test/Vector2Test.cpp b/src/Magnum/Math/Test/Vector2Test.cpp
similarity index 100%
rename from src/Math/Test/Vector2Test.cpp
rename to src/Magnum/Math/Test/Vector2Test.cpp
diff --git a/src/Math/Test/Vector3Test.cpp b/src/Magnum/Math/Test/Vector3Test.cpp
similarity index 100%
rename from src/Math/Test/Vector3Test.cpp
rename to src/Magnum/Math/Test/Vector3Test.cpp
diff --git a/src/Math/Test/Vector4Test.cpp b/src/Magnum/Math/Test/Vector4Test.cpp
similarity index 100%
rename from src/Math/Test/Vector4Test.cpp
rename to src/Magnum/Math/Test/Vector4Test.cpp
diff --git a/src/Math/Test/VectorTest.cpp b/src/Magnum/Math/Test/VectorTest.cpp
similarity index 100%
rename from src/Math/Test/VectorTest.cpp
rename to src/Magnum/Math/Test/VectorTest.cpp
diff --git a/src/Math/TypeTraits.h b/src/Magnum/Math/TypeTraits.h
similarity index 100%
rename from src/Math/TypeTraits.h
rename to src/Magnum/Math/TypeTraits.h
diff --git a/src/Math/Unit.h b/src/Magnum/Math/Unit.h
similarity index 100%
rename from src/Math/Unit.h
rename to src/Magnum/Math/Unit.h
diff --git a/src/Math/Vector.h b/src/Magnum/Math/Vector.h
similarity index 100%
rename from src/Math/Vector.h
rename to src/Magnum/Math/Vector.h
diff --git a/src/Math/Vector2.h b/src/Magnum/Math/Vector2.h
similarity index 100%
rename from src/Math/Vector2.h
rename to src/Magnum/Math/Vector2.h
diff --git a/src/Math/Vector3.h b/src/Magnum/Math/Vector3.h
similarity index 100%
rename from src/Math/Vector3.h
rename to src/Magnum/Math/Vector3.h
diff --git a/src/Math/Vector4.h b/src/Magnum/Math/Vector4.h
similarity index 100%
rename from src/Math/Vector4.h
rename to src/Magnum/Math/Vector4.h
diff --git a/src/Math/instantiation.cpp b/src/Magnum/Math/instantiation.cpp
similarity index 100%
rename from src/Math/instantiation.cpp
rename to src/Magnum/Math/instantiation.cpp
diff --git a/src/Mesh.cpp b/src/Magnum/Mesh.cpp
similarity index 100%
rename from src/Mesh.cpp
rename to src/Magnum/Mesh.cpp
diff --git a/src/Mesh.h b/src/Magnum/Mesh.h
similarity index 100%
rename from src/Mesh.h
rename to src/Magnum/Mesh.h
diff --git a/src/MeshTools/CMakeLists.txt b/src/Magnum/MeshTools/CMakeLists.txt
similarity index 100%
rename from src/MeshTools/CMakeLists.txt
rename to src/Magnum/MeshTools/CMakeLists.txt
diff --git a/src/MeshTools/CombineIndexedArrays.h b/src/Magnum/MeshTools/CombineIndexedArrays.h
similarity index 100%
rename from src/MeshTools/CombineIndexedArrays.h
rename to src/Magnum/MeshTools/CombineIndexedArrays.h
diff --git a/src/MeshTools/CompressIndices.cpp b/src/Magnum/MeshTools/CompressIndices.cpp
similarity index 100%
rename from src/MeshTools/CompressIndices.cpp
rename to src/Magnum/MeshTools/CompressIndices.cpp
diff --git a/src/MeshTools/CompressIndices.h b/src/Magnum/MeshTools/CompressIndices.h
similarity index 100%
rename from src/MeshTools/CompressIndices.h
rename to src/Magnum/MeshTools/CompressIndices.h
diff --git a/src/MeshTools/Duplicate.h b/src/Magnum/MeshTools/Duplicate.h
similarity index 100%
rename from src/MeshTools/Duplicate.h
rename to src/Magnum/MeshTools/Duplicate.h
diff --git a/src/MeshTools/FlipNormals.cpp b/src/Magnum/MeshTools/FlipNormals.cpp
similarity index 100%
rename from src/MeshTools/FlipNormals.cpp
rename to src/Magnum/MeshTools/FlipNormals.cpp
diff --git a/src/MeshTools/FlipNormals.h b/src/Magnum/MeshTools/FlipNormals.h
similarity index 100%
rename from src/MeshTools/FlipNormals.h
rename to src/Magnum/MeshTools/FlipNormals.h
diff --git a/src/MeshTools/FullScreenTriangle.cpp b/src/Magnum/MeshTools/FullScreenTriangle.cpp
similarity index 100%
rename from src/MeshTools/FullScreenTriangle.cpp
rename to src/Magnum/MeshTools/FullScreenTriangle.cpp
diff --git a/src/MeshTools/FullScreenTriangle.h b/src/Magnum/MeshTools/FullScreenTriangle.h
similarity index 100%
rename from src/MeshTools/FullScreenTriangle.h
rename to src/Magnum/MeshTools/FullScreenTriangle.h
diff --git a/src/MeshTools/GenerateFlatNormals.cpp b/src/Magnum/MeshTools/GenerateFlatNormals.cpp
similarity index 100%
rename from src/MeshTools/GenerateFlatNormals.cpp
rename to src/Magnum/MeshTools/GenerateFlatNormals.cpp
diff --git a/src/MeshTools/GenerateFlatNormals.h b/src/Magnum/MeshTools/GenerateFlatNormals.h
similarity index 100%
rename from src/MeshTools/GenerateFlatNormals.h
rename to src/Magnum/MeshTools/GenerateFlatNormals.h
diff --git a/src/MeshTools/Interleave.h b/src/Magnum/MeshTools/Interleave.h
similarity index 100%
rename from src/MeshTools/Interleave.h
rename to src/Magnum/MeshTools/Interleave.h
diff --git a/src/MeshTools/RemoveDuplicates.h b/src/Magnum/MeshTools/RemoveDuplicates.h
similarity index 100%
rename from src/MeshTools/RemoveDuplicates.h
rename to src/Magnum/MeshTools/RemoveDuplicates.h
diff --git a/src/MeshTools/Subdivide.h b/src/Magnum/MeshTools/Subdivide.h
similarity index 100%
rename from src/MeshTools/Subdivide.h
rename to src/Magnum/MeshTools/Subdivide.h
diff --git a/src/MeshTools/Test/CMakeLists.txt b/src/Magnum/MeshTools/Test/CMakeLists.txt
similarity index 100%
rename from src/MeshTools/Test/CMakeLists.txt
rename to src/Magnum/MeshTools/Test/CMakeLists.txt
diff --git a/src/MeshTools/Test/CombineIndexedArraysTest.cpp b/src/Magnum/MeshTools/Test/CombineIndexedArraysTest.cpp
similarity index 100%
rename from src/MeshTools/Test/CombineIndexedArraysTest.cpp
rename to src/Magnum/MeshTools/Test/CombineIndexedArraysTest.cpp
diff --git a/src/MeshTools/Test/CompressIndicesTest.cpp b/src/Magnum/MeshTools/Test/CompressIndicesTest.cpp
similarity index 100%
rename from src/MeshTools/Test/CompressIndicesTest.cpp
rename to src/Magnum/MeshTools/Test/CompressIndicesTest.cpp
diff --git a/src/MeshTools/Test/DuplicateTest.cpp b/src/Magnum/MeshTools/Test/DuplicateTest.cpp
similarity index 100%
rename from src/MeshTools/Test/DuplicateTest.cpp
rename to src/Magnum/MeshTools/Test/DuplicateTest.cpp
diff --git a/src/MeshTools/Test/FlipNormalsTest.cpp b/src/Magnum/MeshTools/Test/FlipNormalsTest.cpp
similarity index 100%
rename from src/MeshTools/Test/FlipNormalsTest.cpp
rename to src/Magnum/MeshTools/Test/FlipNormalsTest.cpp
diff --git a/src/MeshTools/Test/GenerateFlatNormalsTest.cpp b/src/Magnum/MeshTools/Test/GenerateFlatNormalsTest.cpp
similarity index 100%
rename from src/MeshTools/Test/GenerateFlatNormalsTest.cpp
rename to src/Magnum/MeshTools/Test/GenerateFlatNormalsTest.cpp
diff --git a/src/MeshTools/Test/InterleaveTest.cpp b/src/Magnum/MeshTools/Test/InterleaveTest.cpp
similarity index 100%
rename from src/MeshTools/Test/InterleaveTest.cpp
rename to src/Magnum/MeshTools/Test/InterleaveTest.cpp
diff --git a/src/MeshTools/Test/RemoveDuplicatesTest.cpp b/src/Magnum/MeshTools/Test/RemoveDuplicatesTest.cpp
similarity index 100%
rename from src/MeshTools/Test/RemoveDuplicatesTest.cpp
rename to src/Magnum/MeshTools/Test/RemoveDuplicatesTest.cpp
diff --git a/src/MeshTools/Test/SubdivideRemoveDuplicatesBenchmark.cpp b/src/Magnum/MeshTools/Test/SubdivideRemoveDuplicatesBenchmark.cpp
similarity index 100%
rename from src/MeshTools/Test/SubdivideRemoveDuplicatesBenchmark.cpp
rename to src/Magnum/MeshTools/Test/SubdivideRemoveDuplicatesBenchmark.cpp
diff --git a/src/MeshTools/Test/SubdivideRemoveDuplicatesBenchmark.h b/src/Magnum/MeshTools/Test/SubdivideRemoveDuplicatesBenchmark.h
similarity index 100%
rename from src/MeshTools/Test/SubdivideRemoveDuplicatesBenchmark.h
rename to src/Magnum/MeshTools/Test/SubdivideRemoveDuplicatesBenchmark.h
diff --git a/src/MeshTools/Test/SubdivideTest.cpp b/src/Magnum/MeshTools/Test/SubdivideTest.cpp
similarity index 100%
rename from src/MeshTools/Test/SubdivideTest.cpp
rename to src/Magnum/MeshTools/Test/SubdivideTest.cpp
diff --git a/src/MeshTools/Test/TipsifyTest.cpp b/src/Magnum/MeshTools/Test/TipsifyTest.cpp
similarity index 100%
rename from src/MeshTools/Test/TipsifyTest.cpp
rename to src/Magnum/MeshTools/Test/TipsifyTest.cpp
diff --git a/src/MeshTools/Test/TransformTest.cpp b/src/Magnum/MeshTools/Test/TransformTest.cpp
similarity index 100%
rename from src/MeshTools/Test/TransformTest.cpp
rename to src/Magnum/MeshTools/Test/TransformTest.cpp
diff --git a/src/MeshTools/Tipsify.cpp b/src/Magnum/MeshTools/Tipsify.cpp
similarity index 100%
rename from src/MeshTools/Tipsify.cpp
rename to src/Magnum/MeshTools/Tipsify.cpp
diff --git a/src/MeshTools/Tipsify.h b/src/Magnum/MeshTools/Tipsify.h
similarity index 100%
rename from src/MeshTools/Tipsify.h
rename to src/Magnum/MeshTools/Tipsify.h
diff --git a/src/MeshTools/Transform.h b/src/Magnum/MeshTools/Transform.h
similarity index 100%
rename from src/MeshTools/Transform.h
rename to src/Magnum/MeshTools/Transform.h
diff --git a/src/MeshTools/magnumMeshToolsVisibility.h b/src/Magnum/MeshTools/magnumMeshToolsVisibility.h
similarity index 100%
rename from src/MeshTools/magnumMeshToolsVisibility.h
rename to src/Magnum/MeshTools/magnumMeshToolsVisibility.h
diff --git a/src/MeshView.cpp b/src/Magnum/MeshView.cpp
similarity index 100%
rename from src/MeshView.cpp
rename to src/Magnum/MeshView.cpp
diff --git a/src/MeshView.h b/src/Magnum/MeshView.h
similarity index 100%
rename from src/MeshView.h
rename to src/Magnum/MeshView.h
diff --git a/src/OpenGL.cpp b/src/Magnum/OpenGL.cpp
similarity index 100%
rename from src/OpenGL.cpp
rename to src/Magnum/OpenGL.cpp
diff --git a/src/OpenGL.h b/src/Magnum/OpenGL.h
similarity index 100%
rename from src/OpenGL.h
rename to src/Magnum/OpenGL.h
diff --git a/src/Platform/AbstractXApplication.cpp b/src/Magnum/Platform/AbstractXApplication.cpp
similarity index 100%
rename from src/Platform/AbstractXApplication.cpp
rename to src/Magnum/Platform/AbstractXApplication.cpp
diff --git a/src/Platform/AbstractXApplication.h b/src/Magnum/Platform/AbstractXApplication.h
similarity index 100%
rename from src/Platform/AbstractXApplication.h
rename to src/Magnum/Platform/AbstractXApplication.h
diff --git a/src/Platform/CMakeLists.txt b/src/Magnum/Platform/CMakeLists.txt
similarity index 100%
rename from src/Platform/CMakeLists.txt
rename to src/Magnum/Platform/CMakeLists.txt
diff --git a/src/Platform/EmscriptenApplication.js b/src/Magnum/Platform/EmscriptenApplication.js
similarity index 100%
rename from src/Platform/EmscriptenApplication.js
rename to src/Magnum/Platform/EmscriptenApplication.js
diff --git a/src/Platform/GlutApplication.cpp b/src/Magnum/Platform/GlutApplication.cpp
similarity index 100%
rename from src/Platform/GlutApplication.cpp
rename to src/Magnum/Platform/GlutApplication.cpp
diff --git a/src/Platform/GlutApplication.h b/src/Magnum/Platform/GlutApplication.h
similarity index 100%
rename from src/Platform/GlutApplication.h
rename to src/Magnum/Platform/GlutApplication.h
diff --git a/src/Platform/GlxApplication.cpp b/src/Magnum/Platform/GlxApplication.cpp
similarity index 100%
rename from src/Platform/GlxApplication.cpp
rename to src/Magnum/Platform/GlxApplication.cpp
diff --git a/src/Platform/GlxApplication.h b/src/Magnum/Platform/GlxApplication.h
similarity index 100%
rename from src/Platform/GlxApplication.h
rename to src/Magnum/Platform/GlxApplication.h
diff --git a/src/Platform/Implementation/AbstractContextHandler.h b/src/Magnum/Platform/Implementation/AbstractContextHandler.h
similarity index 100%
rename from src/Platform/Implementation/AbstractContextHandler.h
rename to src/Magnum/Platform/Implementation/AbstractContextHandler.h
diff --git a/src/Platform/Implementation/EglContextHandler.cpp b/src/Magnum/Platform/Implementation/EglContextHandler.cpp
similarity index 100%
rename from src/Platform/Implementation/EglContextHandler.cpp
rename to src/Magnum/Platform/Implementation/EglContextHandler.cpp
diff --git a/src/Platform/Implementation/EglContextHandler.h b/src/Magnum/Platform/Implementation/EglContextHandler.h
similarity index 100%
rename from src/Platform/Implementation/EglContextHandler.h
rename to src/Magnum/Platform/Implementation/EglContextHandler.h
diff --git a/src/Platform/Implementation/GlxContextHandler.cpp b/src/Magnum/Platform/Implementation/GlxContextHandler.cpp
similarity index 100%
rename from src/Platform/Implementation/GlxContextHandler.cpp
rename to src/Magnum/Platform/Implementation/GlxContextHandler.cpp
diff --git a/src/Platform/Implementation/GlxContextHandler.h b/src/Magnum/Platform/Implementation/GlxContextHandler.h
similarity index 100%
rename from src/Platform/Implementation/GlxContextHandler.h
rename to src/Magnum/Platform/Implementation/GlxContextHandler.h
diff --git a/src/Platform/NaClApplication.cpp b/src/Magnum/Platform/NaClApplication.cpp
similarity index 100%
rename from src/Platform/NaClApplication.cpp
rename to src/Magnum/Platform/NaClApplication.cpp
diff --git a/src/Platform/NaClApplication.h b/src/Magnum/Platform/NaClApplication.h
similarity index 100%
rename from src/Platform/NaClApplication.h
rename to src/Magnum/Platform/NaClApplication.h
diff --git a/src/Platform/NaClApplication.js b/src/Magnum/Platform/NaClApplication.js
similarity index 100%
rename from src/Platform/NaClApplication.js
rename to src/Magnum/Platform/NaClApplication.js
diff --git a/src/Platform/Platform.h b/src/Magnum/Platform/Platform.h
similarity index 100%
rename from src/Platform/Platform.h
rename to src/Magnum/Platform/Platform.h
diff --git a/src/Platform/Screen.h b/src/Magnum/Platform/Screen.h
similarity index 100%
rename from src/Platform/Screen.h
rename to src/Magnum/Platform/Screen.h
diff --git a/src/Platform/ScreenedApplication.h b/src/Magnum/Platform/ScreenedApplication.h
similarity index 100%
rename from src/Platform/ScreenedApplication.h
rename to src/Magnum/Platform/ScreenedApplication.h
diff --git a/src/Platform/ScreenedApplication.hpp b/src/Magnum/Platform/ScreenedApplication.hpp
similarity index 100%
rename from src/Platform/ScreenedApplication.hpp
rename to src/Magnum/Platform/ScreenedApplication.hpp
diff --git a/src/Platform/Sdl2Application.cpp b/src/Magnum/Platform/Sdl2Application.cpp
similarity index 100%
rename from src/Platform/Sdl2Application.cpp
rename to src/Magnum/Platform/Sdl2Application.cpp
diff --git a/src/Platform/Sdl2Application.h b/src/Magnum/Platform/Sdl2Application.h
similarity index 100%
rename from src/Platform/Sdl2Application.h
rename to src/Magnum/Platform/Sdl2Application.h
diff --git a/src/Platform/WebApplication.css b/src/Magnum/Platform/WebApplication.css
similarity index 100%
rename from src/Platform/WebApplication.css
rename to src/Magnum/Platform/WebApplication.css
diff --git a/src/Platform/WindowlessGlxApplication.cpp b/src/Magnum/Platform/WindowlessGlxApplication.cpp
similarity index 100%
rename from src/Platform/WindowlessGlxApplication.cpp
rename to src/Magnum/Platform/WindowlessGlxApplication.cpp
diff --git a/src/Platform/WindowlessGlxApplication.h b/src/Magnum/Platform/WindowlessGlxApplication.h
similarity index 100%
rename from src/Platform/WindowlessGlxApplication.h
rename to src/Magnum/Platform/WindowlessGlxApplication.h
diff --git a/src/Platform/WindowlessNaClApplication.cpp b/src/Magnum/Platform/WindowlessNaClApplication.cpp
similarity index 100%
rename from src/Platform/WindowlessNaClApplication.cpp
rename to src/Magnum/Platform/WindowlessNaClApplication.cpp
diff --git a/src/Platform/WindowlessNaClApplication.h b/src/Magnum/Platform/WindowlessNaClApplication.h
similarity index 100%
rename from src/Platform/WindowlessNaClApplication.h
rename to src/Magnum/Platform/WindowlessNaClApplication.h
diff --git a/src/Platform/XEglApplication.cpp b/src/Magnum/Platform/XEglApplication.cpp
similarity index 100%
rename from src/Platform/XEglApplication.cpp
rename to src/Magnum/Platform/XEglApplication.cpp
diff --git a/src/Platform/XEglApplication.h b/src/Magnum/Platform/XEglApplication.h
similarity index 100%
rename from src/Platform/XEglApplication.h
rename to src/Magnum/Platform/XEglApplication.h
diff --git a/src/Platform/magnum-info-nacl.html b/src/Magnum/Platform/magnum-info-nacl.html
similarity index 100%
rename from src/Platform/magnum-info-nacl.html
rename to src/Magnum/Platform/magnum-info-nacl.html
diff --git a/src/Platform/magnum-info-nacl.nmf b/src/Magnum/Platform/magnum-info-nacl.nmf
similarity index 100%
rename from src/Platform/magnum-info-nacl.nmf
rename to src/Magnum/Platform/magnum-info-nacl.nmf
diff --git a/src/Platform/magnum-info.cpp b/src/Magnum/Platform/magnum-info.cpp
similarity index 100%
rename from src/Platform/magnum-info.cpp
rename to src/Magnum/Platform/magnum-info.cpp
diff --git a/src/Primitives/CMakeLists.txt b/src/Magnum/Primitives/CMakeLists.txt
similarity index 100%
rename from src/Primitives/CMakeLists.txt
rename to src/Magnum/Primitives/CMakeLists.txt
diff --git a/src/Primitives/Capsule.cpp b/src/Magnum/Primitives/Capsule.cpp
similarity index 100%
rename from src/Primitives/Capsule.cpp
rename to src/Magnum/Primitives/Capsule.cpp
diff --git a/src/Primitives/Capsule.h b/src/Magnum/Primitives/Capsule.h
similarity index 100%
rename from src/Primitives/Capsule.h
rename to src/Magnum/Primitives/Capsule.h
diff --git a/src/Primitives/Circle.cpp b/src/Magnum/Primitives/Circle.cpp
similarity index 100%
rename from src/Primitives/Circle.cpp
rename to src/Magnum/Primitives/Circle.cpp
diff --git a/src/Primitives/Circle.h b/src/Magnum/Primitives/Circle.h
similarity index 100%
rename from src/Primitives/Circle.h
rename to src/Magnum/Primitives/Circle.h
diff --git a/src/Primitives/Crosshair.cpp b/src/Magnum/Primitives/Crosshair.cpp
similarity index 100%
rename from src/Primitives/Crosshair.cpp
rename to src/Magnum/Primitives/Crosshair.cpp
diff --git a/src/Primitives/Crosshair.h b/src/Magnum/Primitives/Crosshair.h
similarity index 100%
rename from src/Primitives/Crosshair.h
rename to src/Magnum/Primitives/Crosshair.h
diff --git a/src/Primitives/Cube.cpp b/src/Magnum/Primitives/Cube.cpp
similarity index 100%
rename from src/Primitives/Cube.cpp
rename to src/Magnum/Primitives/Cube.cpp
diff --git a/src/Primitives/Cube.h b/src/Magnum/Primitives/Cube.h
similarity index 100%
rename from src/Primitives/Cube.h
rename to src/Magnum/Primitives/Cube.h
diff --git a/src/Primitives/Cylinder.cpp b/src/Magnum/Primitives/Cylinder.cpp
similarity index 100%
rename from src/Primitives/Cylinder.cpp
rename to src/Magnum/Primitives/Cylinder.cpp
diff --git a/src/Primitives/Cylinder.h b/src/Magnum/Primitives/Cylinder.h
similarity index 100%
rename from src/Primitives/Cylinder.h
rename to src/Magnum/Primitives/Cylinder.h
diff --git a/src/Primitives/Icosphere.cpp b/src/Magnum/Primitives/Icosphere.cpp
similarity index 100%
rename from src/Primitives/Icosphere.cpp
rename to src/Magnum/Primitives/Icosphere.cpp
diff --git a/src/Primitives/Icosphere.h b/src/Magnum/Primitives/Icosphere.h
similarity index 100%
rename from src/Primitives/Icosphere.h
rename to src/Magnum/Primitives/Icosphere.h
diff --git a/src/Primitives/Implementation/Spheroid.cpp b/src/Magnum/Primitives/Implementation/Spheroid.cpp
similarity index 100%
rename from src/Primitives/Implementation/Spheroid.cpp
rename to src/Magnum/Primitives/Implementation/Spheroid.cpp
diff --git a/src/Primitives/Implementation/Spheroid.h b/src/Magnum/Primitives/Implementation/Spheroid.h
similarity index 100%
rename from src/Primitives/Implementation/Spheroid.h
rename to src/Magnum/Primitives/Implementation/Spheroid.h
diff --git a/src/Primitives/Implementation/WireframeSpheroid.cpp b/src/Magnum/Primitives/Implementation/WireframeSpheroid.cpp
similarity index 100%
rename from src/Primitives/Implementation/WireframeSpheroid.cpp
rename to src/Magnum/Primitives/Implementation/WireframeSpheroid.cpp
diff --git a/src/Primitives/Implementation/WireframeSpheroid.h b/src/Magnum/Primitives/Implementation/WireframeSpheroid.h
similarity index 100%
rename from src/Primitives/Implementation/WireframeSpheroid.h
rename to src/Magnum/Primitives/Implementation/WireframeSpheroid.h
diff --git a/src/Primitives/Line.cpp b/src/Magnum/Primitives/Line.cpp
similarity index 100%
rename from src/Primitives/Line.cpp
rename to src/Magnum/Primitives/Line.cpp
diff --git a/src/Primitives/Line.h b/src/Magnum/Primitives/Line.h
similarity index 100%
rename from src/Primitives/Line.h
rename to src/Magnum/Primitives/Line.h
diff --git a/src/Primitives/Plane.cpp b/src/Magnum/Primitives/Plane.cpp
similarity index 100%
rename from src/Primitives/Plane.cpp
rename to src/Magnum/Primitives/Plane.cpp
diff --git a/src/Primitives/Plane.h b/src/Magnum/Primitives/Plane.h
similarity index 100%
rename from src/Primitives/Plane.h
rename to src/Magnum/Primitives/Plane.h
diff --git a/src/Primitives/Square.cpp b/src/Magnum/Primitives/Square.cpp
similarity index 100%
rename from src/Primitives/Square.cpp
rename to src/Magnum/Primitives/Square.cpp
diff --git a/src/Primitives/Square.h b/src/Magnum/Primitives/Square.h
similarity index 100%
rename from src/Primitives/Square.h
rename to src/Magnum/Primitives/Square.h
diff --git a/src/Primitives/Test/CMakeLists.txt b/src/Magnum/Primitives/Test/CMakeLists.txt
similarity index 100%
rename from src/Primitives/Test/CMakeLists.txt
rename to src/Magnum/Primitives/Test/CMakeLists.txt
diff --git a/src/Primitives/Test/CapsuleTest.cpp b/src/Magnum/Primitives/Test/CapsuleTest.cpp
similarity index 100%
rename from src/Primitives/Test/CapsuleTest.cpp
rename to src/Magnum/Primitives/Test/CapsuleTest.cpp
diff --git a/src/Primitives/Test/CircleTest.cpp b/src/Magnum/Primitives/Test/CircleTest.cpp
similarity index 100%
rename from src/Primitives/Test/CircleTest.cpp
rename to src/Magnum/Primitives/Test/CircleTest.cpp
diff --git a/src/Primitives/Test/CylinderTest.cpp b/src/Magnum/Primitives/Test/CylinderTest.cpp
similarity index 100%
rename from src/Primitives/Test/CylinderTest.cpp
rename to src/Magnum/Primitives/Test/CylinderTest.cpp
diff --git a/src/Primitives/Test/IcosphereTest.cpp b/src/Magnum/Primitives/Test/IcosphereTest.cpp
similarity index 100%
rename from src/Primitives/Test/IcosphereTest.cpp
rename to src/Magnum/Primitives/Test/IcosphereTest.cpp
diff --git a/src/Primitives/Test/UVSphereTest.cpp b/src/Magnum/Primitives/Test/UVSphereTest.cpp
similarity index 100%
rename from src/Primitives/Test/UVSphereTest.cpp
rename to src/Magnum/Primitives/Test/UVSphereTest.cpp
diff --git a/src/Primitives/UVSphere.cpp b/src/Magnum/Primitives/UVSphere.cpp
similarity index 100%
rename from src/Primitives/UVSphere.cpp
rename to src/Magnum/Primitives/UVSphere.cpp
diff --git a/src/Primitives/UVSphere.h b/src/Magnum/Primitives/UVSphere.h
similarity index 100%
rename from src/Primitives/UVSphere.h
rename to src/Magnum/Primitives/UVSphere.h
diff --git a/src/Primitives/magnumPrimitivesVisibility.h b/src/Magnum/Primitives/magnumPrimitivesVisibility.h
similarity index 100%
rename from src/Primitives/magnumPrimitivesVisibility.h
rename to src/Magnum/Primitives/magnumPrimitivesVisibility.h
diff --git a/src/Query.cpp b/src/Magnum/Query.cpp
similarity index 100%
rename from src/Query.cpp
rename to src/Magnum/Query.cpp
diff --git a/src/Query.h b/src/Magnum/Query.h
similarity index 100%
rename from src/Query.h
rename to src/Magnum/Query.h
diff --git a/src/Renderbuffer.cpp b/src/Magnum/Renderbuffer.cpp
similarity index 100%
rename from src/Renderbuffer.cpp
rename to src/Magnum/Renderbuffer.cpp
diff --git a/src/Renderbuffer.h b/src/Magnum/Renderbuffer.h
similarity index 100%
rename from src/Renderbuffer.h
rename to src/Magnum/Renderbuffer.h
diff --git a/src/RenderbufferFormat.h b/src/Magnum/RenderbufferFormat.h
similarity index 100%
rename from src/RenderbufferFormat.h
rename to src/Magnum/RenderbufferFormat.h
diff --git a/src/Renderer.cpp b/src/Magnum/Renderer.cpp
similarity index 100%
rename from src/Renderer.cpp
rename to src/Magnum/Renderer.cpp
diff --git a/src/Renderer.h b/src/Magnum/Renderer.h
similarity index 100%
rename from src/Renderer.h
rename to src/Magnum/Renderer.h
diff --git a/src/Resource.cpp b/src/Magnum/Resource.cpp
similarity index 100%
rename from src/Resource.cpp
rename to src/Magnum/Resource.cpp
diff --git a/src/Resource.h b/src/Magnum/Resource.h
similarity index 100%
rename from src/Resource.h
rename to src/Magnum/Resource.h
diff --git a/src/ResourceManager.h b/src/Magnum/ResourceManager.h
similarity index 100%
rename from src/ResourceManager.h
rename to src/Magnum/ResourceManager.h
diff --git a/src/Sampler.cpp b/src/Magnum/Sampler.cpp
similarity index 100%
rename from src/Sampler.cpp
rename to src/Magnum/Sampler.cpp
diff --git a/src/Sampler.h b/src/Magnum/Sampler.h
similarity index 100%
rename from src/Sampler.h
rename to src/Magnum/Sampler.h
diff --git a/src/SceneGraph/AbstractCamera.h b/src/Magnum/SceneGraph/AbstractCamera.h
similarity index 100%
rename from src/SceneGraph/AbstractCamera.h
rename to src/Magnum/SceneGraph/AbstractCamera.h
diff --git a/src/SceneGraph/AbstractCamera.hpp b/src/Magnum/SceneGraph/AbstractCamera.hpp
similarity index 100%
rename from src/SceneGraph/AbstractCamera.hpp
rename to src/Magnum/SceneGraph/AbstractCamera.hpp
diff --git a/src/SceneGraph/AbstractFeature.h b/src/Magnum/SceneGraph/AbstractFeature.h
similarity index 100%
rename from src/SceneGraph/AbstractFeature.h
rename to src/Magnum/SceneGraph/AbstractFeature.h
diff --git a/src/SceneGraph/AbstractFeature.hpp b/src/Magnum/SceneGraph/AbstractFeature.hpp
similarity index 100%
rename from src/SceneGraph/AbstractFeature.hpp
rename to src/Magnum/SceneGraph/AbstractFeature.hpp
diff --git a/src/SceneGraph/AbstractGroupedFeature.h b/src/Magnum/SceneGraph/AbstractGroupedFeature.h
similarity index 100%
rename from src/SceneGraph/AbstractGroupedFeature.h
rename to src/Magnum/SceneGraph/AbstractGroupedFeature.h
diff --git a/src/SceneGraph/AbstractObject.h b/src/Magnum/SceneGraph/AbstractObject.h
similarity index 100%
rename from src/SceneGraph/AbstractObject.h
rename to src/Magnum/SceneGraph/AbstractObject.h
diff --git a/src/SceneGraph/AbstractTransformation.h b/src/Magnum/SceneGraph/AbstractTransformation.h
similarity index 100%
rename from src/SceneGraph/AbstractTransformation.h
rename to src/Magnum/SceneGraph/AbstractTransformation.h
diff --git a/src/SceneGraph/AbstractTranslation.h b/src/Magnum/SceneGraph/AbstractTranslation.h
similarity index 100%
rename from src/SceneGraph/AbstractTranslation.h
rename to src/Magnum/SceneGraph/AbstractTranslation.h
diff --git a/src/SceneGraph/AbstractTranslationRotation2D.h b/src/Magnum/SceneGraph/AbstractTranslationRotation2D.h
similarity index 100%
rename from src/SceneGraph/AbstractTranslationRotation2D.h
rename to src/Magnum/SceneGraph/AbstractTranslationRotation2D.h
diff --git a/src/SceneGraph/AbstractTranslationRotation3D.h b/src/Magnum/SceneGraph/AbstractTranslationRotation3D.h
similarity index 100%
rename from src/SceneGraph/AbstractTranslationRotation3D.h
rename to src/Magnum/SceneGraph/AbstractTranslationRotation3D.h
diff --git a/src/SceneGraph/AbstractTranslationRotationScaling2D.h b/src/Magnum/SceneGraph/AbstractTranslationRotationScaling2D.h
similarity index 100%
rename from src/SceneGraph/AbstractTranslationRotationScaling2D.h
rename to src/Magnum/SceneGraph/AbstractTranslationRotationScaling2D.h
diff --git a/src/SceneGraph/AbstractTranslationRotationScaling3D.h b/src/Magnum/SceneGraph/AbstractTranslationRotationScaling3D.h
similarity index 100%
rename from src/SceneGraph/AbstractTranslationRotationScaling3D.h
rename to src/Magnum/SceneGraph/AbstractTranslationRotationScaling3D.h
diff --git a/src/SceneGraph/Animable.cpp b/src/Magnum/SceneGraph/Animable.cpp
similarity index 100%
rename from src/SceneGraph/Animable.cpp
rename to src/Magnum/SceneGraph/Animable.cpp
diff --git a/src/SceneGraph/Animable.h b/src/Magnum/SceneGraph/Animable.h
similarity index 100%
rename from src/SceneGraph/Animable.h
rename to src/Magnum/SceneGraph/Animable.h
diff --git a/src/SceneGraph/Animable.hpp b/src/Magnum/SceneGraph/Animable.hpp
similarity index 100%
rename from src/SceneGraph/Animable.hpp
rename to src/Magnum/SceneGraph/Animable.hpp
diff --git a/src/SceneGraph/AnimableGroup.h b/src/Magnum/SceneGraph/AnimableGroup.h
similarity index 100%
rename from src/SceneGraph/AnimableGroup.h
rename to src/Magnum/SceneGraph/AnimableGroup.h
diff --git a/src/SceneGraph/CMakeLists.txt b/src/Magnum/SceneGraph/CMakeLists.txt
similarity index 100%
rename from src/SceneGraph/CMakeLists.txt
rename to src/Magnum/SceneGraph/CMakeLists.txt
diff --git a/src/SceneGraph/Camera2D.h b/src/Magnum/SceneGraph/Camera2D.h
similarity index 100%
rename from src/SceneGraph/Camera2D.h
rename to src/Magnum/SceneGraph/Camera2D.h
diff --git a/src/SceneGraph/Camera2D.hpp b/src/Magnum/SceneGraph/Camera2D.hpp
similarity index 100%
rename from src/SceneGraph/Camera2D.hpp
rename to src/Magnum/SceneGraph/Camera2D.hpp
diff --git a/src/SceneGraph/Camera3D.h b/src/Magnum/SceneGraph/Camera3D.h
similarity index 100%
rename from src/SceneGraph/Camera3D.h
rename to src/Magnum/SceneGraph/Camera3D.h
diff --git a/src/SceneGraph/Camera3D.hpp b/src/Magnum/SceneGraph/Camera3D.hpp
similarity index 100%
rename from src/SceneGraph/Camera3D.hpp
rename to src/Magnum/SceneGraph/Camera3D.hpp
diff --git a/src/SceneGraph/Drawable.h b/src/Magnum/SceneGraph/Drawable.h
similarity index 100%
rename from src/SceneGraph/Drawable.h
rename to src/Magnum/SceneGraph/Drawable.h
diff --git a/src/SceneGraph/Drawable.hpp b/src/Magnum/SceneGraph/Drawable.hpp
similarity index 100%
rename from src/SceneGraph/Drawable.hpp
rename to src/Magnum/SceneGraph/Drawable.hpp
diff --git a/src/SceneGraph/DualComplexTransformation.h b/src/Magnum/SceneGraph/DualComplexTransformation.h
similarity index 100%
rename from src/SceneGraph/DualComplexTransformation.h
rename to src/Magnum/SceneGraph/DualComplexTransformation.h
diff --git a/src/SceneGraph/DualQuaternionTransformation.h b/src/Magnum/SceneGraph/DualQuaternionTransformation.h
similarity index 100%
rename from src/SceneGraph/DualQuaternionTransformation.h
rename to src/Magnum/SceneGraph/DualQuaternionTransformation.h
diff --git a/src/SceneGraph/FeatureGroup.h b/src/Magnum/SceneGraph/FeatureGroup.h
similarity index 100%
rename from src/SceneGraph/FeatureGroup.h
rename to src/Magnum/SceneGraph/FeatureGroup.h
diff --git a/src/SceneGraph/FeatureGroup.hpp b/src/Magnum/SceneGraph/FeatureGroup.hpp
similarity index 100%
rename from src/SceneGraph/FeatureGroup.hpp
rename to src/Magnum/SceneGraph/FeatureGroup.hpp
diff --git a/src/SceneGraph/MatrixTransformation2D.h b/src/Magnum/SceneGraph/MatrixTransformation2D.h
similarity index 100%
rename from src/SceneGraph/MatrixTransformation2D.h
rename to src/Magnum/SceneGraph/MatrixTransformation2D.h
diff --git a/src/SceneGraph/MatrixTransformation3D.h b/src/Magnum/SceneGraph/MatrixTransformation3D.h
similarity index 100%
rename from src/SceneGraph/MatrixTransformation3D.h
rename to src/Magnum/SceneGraph/MatrixTransformation3D.h
diff --git a/src/SceneGraph/Object.h b/src/Magnum/SceneGraph/Object.h
similarity index 100%
rename from src/SceneGraph/Object.h
rename to src/Magnum/SceneGraph/Object.h
diff --git a/src/SceneGraph/Object.hpp b/src/Magnum/SceneGraph/Object.hpp
similarity index 100%
rename from src/SceneGraph/Object.hpp
rename to src/Magnum/SceneGraph/Object.hpp
diff --git a/src/SceneGraph/RigidMatrixTransformation2D.h b/src/Magnum/SceneGraph/RigidMatrixTransformation2D.h
similarity index 100%
rename from src/SceneGraph/RigidMatrixTransformation2D.h
rename to src/Magnum/SceneGraph/RigidMatrixTransformation2D.h
diff --git a/src/SceneGraph/RigidMatrixTransformation3D.h b/src/Magnum/SceneGraph/RigidMatrixTransformation3D.h
similarity index 100%
rename from src/SceneGraph/RigidMatrixTransformation3D.h
rename to src/Magnum/SceneGraph/RigidMatrixTransformation3D.h
diff --git a/src/SceneGraph/Scene.h b/src/Magnum/SceneGraph/Scene.h
similarity index 100%
rename from src/SceneGraph/Scene.h
rename to src/Magnum/SceneGraph/Scene.h
diff --git a/src/SceneGraph/SceneGraph.h b/src/Magnum/SceneGraph/SceneGraph.h
similarity index 100%
rename from src/SceneGraph/SceneGraph.h
rename to src/Magnum/SceneGraph/SceneGraph.h
diff --git a/src/SceneGraph/Test/AnimableTest.cpp b/src/Magnum/SceneGraph/Test/AnimableTest.cpp
similarity index 100%
rename from src/SceneGraph/Test/AnimableTest.cpp
rename to src/Magnum/SceneGraph/Test/AnimableTest.cpp
diff --git a/src/SceneGraph/Test/CMakeLists.txt b/src/Magnum/SceneGraph/Test/CMakeLists.txt
similarity index 100%
rename from src/SceneGraph/Test/CMakeLists.txt
rename to src/Magnum/SceneGraph/Test/CMakeLists.txt
diff --git a/src/SceneGraph/Test/CameraTest.cpp b/src/Magnum/SceneGraph/Test/CameraTest.cpp
similarity index 100%
rename from src/SceneGraph/Test/CameraTest.cpp
rename to src/Magnum/SceneGraph/Test/CameraTest.cpp
diff --git a/src/SceneGraph/Test/DualComplexTransformationTest.cpp b/src/Magnum/SceneGraph/Test/DualComplexTransformationTest.cpp
similarity index 100%
rename from src/SceneGraph/Test/DualComplexTransformationTest.cpp
rename to src/Magnum/SceneGraph/Test/DualComplexTransformationTest.cpp
diff --git a/src/SceneGraph/Test/DualQuaternionTransformationTest.cpp b/src/Magnum/SceneGraph/Test/DualQuaternionTransformationTest.cpp
similarity index 100%
rename from src/SceneGraph/Test/DualQuaternionTransformationTest.cpp
rename to src/Magnum/SceneGraph/Test/DualQuaternionTransformationTest.cpp
diff --git a/src/SceneGraph/Test/MatrixTransformation2DTest.cpp b/src/Magnum/SceneGraph/Test/MatrixTransformation2DTest.cpp
similarity index 100%
rename from src/SceneGraph/Test/MatrixTransformation2DTest.cpp
rename to src/Magnum/SceneGraph/Test/MatrixTransformation2DTest.cpp
diff --git a/src/SceneGraph/Test/MatrixTransformation3DTest.cpp b/src/Magnum/SceneGraph/Test/MatrixTransformation3DTest.cpp
similarity index 100%
rename from src/SceneGraph/Test/MatrixTransformation3DTest.cpp
rename to src/Magnum/SceneGraph/Test/MatrixTransformation3DTest.cpp
diff --git a/src/SceneGraph/Test/ObjectTest.cpp b/src/Magnum/SceneGraph/Test/ObjectTest.cpp
similarity index 100%
rename from src/SceneGraph/Test/ObjectTest.cpp
rename to src/Magnum/SceneGraph/Test/ObjectTest.cpp
diff --git a/src/SceneGraph/Test/RigidMatrixTransformation2DTest.cpp b/src/Magnum/SceneGraph/Test/RigidMatrixTransformation2DTest.cpp
similarity index 100%
rename from src/SceneGraph/Test/RigidMatrixTransformation2DTest.cpp
rename to src/Magnum/SceneGraph/Test/RigidMatrixTransformation2DTest.cpp
diff --git a/src/SceneGraph/Test/RigidMatrixTransformation3DTest.cpp b/src/Magnum/SceneGraph/Test/RigidMatrixTransformation3DTest.cpp
similarity index 100%
rename from src/SceneGraph/Test/RigidMatrixTransformation3DTest.cpp
rename to src/Magnum/SceneGraph/Test/RigidMatrixTransformation3DTest.cpp
diff --git a/src/SceneGraph/Test/SceneTest.cpp b/src/Magnum/SceneGraph/Test/SceneTest.cpp
similarity index 100%
rename from src/SceneGraph/Test/SceneTest.cpp
rename to src/Magnum/SceneGraph/Test/SceneTest.cpp
diff --git a/src/SceneGraph/Test/TranslationTransformationTest.cpp b/src/Magnum/SceneGraph/Test/TranslationTransformationTest.cpp
similarity index 100%
rename from src/SceneGraph/Test/TranslationTransformationTest.cpp
rename to src/Magnum/SceneGraph/Test/TranslationTransformationTest.cpp
diff --git a/src/SceneGraph/TranslationTransformation.h b/src/Magnum/SceneGraph/TranslationTransformation.h
similarity index 100%
rename from src/SceneGraph/TranslationTransformation.h
rename to src/Magnum/SceneGraph/TranslationTransformation.h
diff --git a/src/SceneGraph/instantiation.cpp b/src/Magnum/SceneGraph/instantiation.cpp
similarity index 100%
rename from src/SceneGraph/instantiation.cpp
rename to src/Magnum/SceneGraph/instantiation.cpp
diff --git a/src/SceneGraph/magnumSceneGraphVisibility.h b/src/Magnum/SceneGraph/magnumSceneGraphVisibility.h
similarity index 100%
rename from src/SceneGraph/magnumSceneGraphVisibility.h
rename to src/Magnum/SceneGraph/magnumSceneGraphVisibility.h
diff --git a/src/Shader.cpp b/src/Magnum/Shader.cpp
similarity index 100%
rename from src/Shader.cpp
rename to src/Magnum/Shader.cpp
diff --git a/src/Shader.h b/src/Magnum/Shader.h
similarity index 100%
rename from src/Shader.h
rename to src/Magnum/Shader.h
diff --git a/src/Shaders/AbstractVector.h b/src/Magnum/Shaders/AbstractVector.h
similarity index 100%
rename from src/Shaders/AbstractVector.h
rename to src/Magnum/Shaders/AbstractVector.h
diff --git a/src/Shaders/AbstractVector2D.vert b/src/Magnum/Shaders/AbstractVector2D.vert
similarity index 100%
rename from src/Shaders/AbstractVector2D.vert
rename to src/Magnum/Shaders/AbstractVector2D.vert
diff --git a/src/Shaders/AbstractVector3D.vert b/src/Magnum/Shaders/AbstractVector3D.vert
similarity index 100%
rename from src/Shaders/AbstractVector3D.vert
rename to src/Magnum/Shaders/AbstractVector3D.vert
diff --git a/src/Shaders/CMakeLists.txt b/src/Magnum/Shaders/CMakeLists.txt
similarity index 100%
rename from src/Shaders/CMakeLists.txt
rename to src/Magnum/Shaders/CMakeLists.txt
diff --git a/src/Shaders/DistanceFieldVector.cpp b/src/Magnum/Shaders/DistanceFieldVector.cpp
similarity index 100%
rename from src/Shaders/DistanceFieldVector.cpp
rename to src/Magnum/Shaders/DistanceFieldVector.cpp
diff --git a/src/Shaders/DistanceFieldVector.frag b/src/Magnum/Shaders/DistanceFieldVector.frag
similarity index 100%
rename from src/Shaders/DistanceFieldVector.frag
rename to src/Magnum/Shaders/DistanceFieldVector.frag
diff --git a/src/Shaders/DistanceFieldVector.h b/src/Magnum/Shaders/DistanceFieldVector.h
similarity index 100%
rename from src/Shaders/DistanceFieldVector.h
rename to src/Magnum/Shaders/DistanceFieldVector.h
diff --git a/src/Shaders/Flat.cpp b/src/Magnum/Shaders/Flat.cpp
similarity index 100%
rename from src/Shaders/Flat.cpp
rename to src/Magnum/Shaders/Flat.cpp
diff --git a/src/Shaders/Flat.frag b/src/Magnum/Shaders/Flat.frag
similarity index 100%
rename from src/Shaders/Flat.frag
rename to src/Magnum/Shaders/Flat.frag
diff --git a/src/Shaders/Flat.h b/src/Magnum/Shaders/Flat.h
similarity index 100%
rename from src/Shaders/Flat.h
rename to src/Magnum/Shaders/Flat.h
diff --git a/src/Shaders/Flat2D.vert b/src/Magnum/Shaders/Flat2D.vert
similarity index 100%
rename from src/Shaders/Flat2D.vert
rename to src/Magnum/Shaders/Flat2D.vert
diff --git a/src/Shaders/Flat3D.vert b/src/Magnum/Shaders/Flat3D.vert
similarity index 100%
rename from src/Shaders/Flat3D.vert
rename to src/Magnum/Shaders/Flat3D.vert
diff --git a/src/Shaders/FullScreenTriangle.glsl b/src/Magnum/Shaders/FullScreenTriangle.glsl
similarity index 100%
rename from src/Shaders/FullScreenTriangle.glsl
rename to src/Magnum/Shaders/FullScreenTriangle.glsl
diff --git a/src/Shaders/Generic.h b/src/Magnum/Shaders/Generic.h
similarity index 100%
rename from src/Shaders/Generic.h
rename to src/Magnum/Shaders/Generic.h
diff --git a/src/Shaders/MeshVisualizer.cpp b/src/Magnum/Shaders/MeshVisualizer.cpp
similarity index 100%
rename from src/Shaders/MeshVisualizer.cpp
rename to src/Magnum/Shaders/MeshVisualizer.cpp
diff --git a/src/Shaders/MeshVisualizer.frag b/src/Magnum/Shaders/MeshVisualizer.frag
similarity index 100%
rename from src/Shaders/MeshVisualizer.frag
rename to src/Magnum/Shaders/MeshVisualizer.frag
diff --git a/src/Shaders/MeshVisualizer.geom b/src/Magnum/Shaders/MeshVisualizer.geom
similarity index 100%
rename from src/Shaders/MeshVisualizer.geom
rename to src/Magnum/Shaders/MeshVisualizer.geom
diff --git a/src/Shaders/MeshVisualizer.h b/src/Magnum/Shaders/MeshVisualizer.h
similarity index 100%
rename from src/Shaders/MeshVisualizer.h
rename to src/Magnum/Shaders/MeshVisualizer.h
diff --git a/src/Shaders/MeshVisualizer.vert b/src/Magnum/Shaders/MeshVisualizer.vert
similarity index 100%
rename from src/Shaders/MeshVisualizer.vert
rename to src/Magnum/Shaders/MeshVisualizer.vert
diff --git a/src/Shaders/Phong.cpp b/src/Magnum/Shaders/Phong.cpp
similarity index 100%
rename from src/Shaders/Phong.cpp
rename to src/Magnum/Shaders/Phong.cpp
diff --git a/src/Shaders/Phong.frag b/src/Magnum/Shaders/Phong.frag
similarity index 100%
rename from src/Shaders/Phong.frag
rename to src/Magnum/Shaders/Phong.frag
diff --git a/src/Shaders/Phong.h b/src/Magnum/Shaders/Phong.h
similarity index 100%
rename from src/Shaders/Phong.h
rename to src/Magnum/Shaders/Phong.h
diff --git a/src/Shaders/Phong.vert b/src/Magnum/Shaders/Phong.vert
similarity index 100%
rename from src/Shaders/Phong.vert
rename to src/Magnum/Shaders/Phong.vert
diff --git a/src/Shaders/Shaders.h b/src/Magnum/Shaders/Shaders.h
similarity index 100%
rename from src/Shaders/Shaders.h
rename to src/Magnum/Shaders/Shaders.h
diff --git a/src/Shaders/Test/CMakeLists.txt b/src/Magnum/Shaders/Test/CMakeLists.txt
similarity index 100%
rename from src/Shaders/Test/CMakeLists.txt
rename to src/Magnum/Shaders/Test/CMakeLists.txt
diff --git a/src/Shaders/Test/DistanceFieldVectorGLTest.cpp b/src/Magnum/Shaders/Test/DistanceFieldVectorGLTest.cpp
similarity index 100%
rename from src/Shaders/Test/DistanceFieldVectorGLTest.cpp
rename to src/Magnum/Shaders/Test/DistanceFieldVectorGLTest.cpp
diff --git a/src/Shaders/Test/FlatGLTest.cpp b/src/Magnum/Shaders/Test/FlatGLTest.cpp
similarity index 100%
rename from src/Shaders/Test/FlatGLTest.cpp
rename to src/Magnum/Shaders/Test/FlatGLTest.cpp
diff --git a/src/Shaders/Test/MeshVisualizerGLTest.cpp b/src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp
similarity index 100%
rename from src/Shaders/Test/MeshVisualizerGLTest.cpp
rename to src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp
diff --git a/src/Shaders/Test/PhongGLTest.cpp b/src/Magnum/Shaders/Test/PhongGLTest.cpp
similarity index 100%
rename from src/Shaders/Test/PhongGLTest.cpp
rename to src/Magnum/Shaders/Test/PhongGLTest.cpp
diff --git a/src/Shaders/Test/VectorGLTest.cpp b/src/Magnum/Shaders/Test/VectorGLTest.cpp
similarity index 100%
rename from src/Shaders/Test/VectorGLTest.cpp
rename to src/Magnum/Shaders/Test/VectorGLTest.cpp
diff --git a/src/Shaders/Test/VertexColorGLTest.cpp b/src/Magnum/Shaders/Test/VertexColorGLTest.cpp
similarity index 100%
rename from src/Shaders/Test/VertexColorGLTest.cpp
rename to src/Magnum/Shaders/Test/VertexColorGLTest.cpp
diff --git a/src/Shaders/Vector.cpp b/src/Magnum/Shaders/Vector.cpp
similarity index 100%
rename from src/Shaders/Vector.cpp
rename to src/Magnum/Shaders/Vector.cpp
diff --git a/src/Shaders/Vector.frag b/src/Magnum/Shaders/Vector.frag
similarity index 100%
rename from src/Shaders/Vector.frag
rename to src/Magnum/Shaders/Vector.frag
diff --git a/src/Shaders/Vector.h b/src/Magnum/Shaders/Vector.h
similarity index 100%
rename from src/Shaders/Vector.h
rename to src/Magnum/Shaders/Vector.h
diff --git a/src/Shaders/VertexColor.cpp b/src/Magnum/Shaders/VertexColor.cpp
similarity index 100%
rename from src/Shaders/VertexColor.cpp
rename to src/Magnum/Shaders/VertexColor.cpp
diff --git a/src/Shaders/VertexColor.frag b/src/Magnum/Shaders/VertexColor.frag
similarity index 100%
rename from src/Shaders/VertexColor.frag
rename to src/Magnum/Shaders/VertexColor.frag
diff --git a/src/Shaders/VertexColor.h b/src/Magnum/Shaders/VertexColor.h
similarity index 100%
rename from src/Shaders/VertexColor.h
rename to src/Magnum/Shaders/VertexColor.h
diff --git a/src/Shaders/VertexColor2D.vert b/src/Magnum/Shaders/VertexColor2D.vert
similarity index 100%
rename from src/Shaders/VertexColor2D.vert
rename to src/Magnum/Shaders/VertexColor2D.vert
diff --git a/src/Shaders/VertexColor3D.vert b/src/Magnum/Shaders/VertexColor3D.vert
similarity index 100%
rename from src/Shaders/VertexColor3D.vert
rename to src/Magnum/Shaders/VertexColor3D.vert
diff --git a/src/Shaders/compatibility.glsl b/src/Magnum/Shaders/compatibility.glsl
similarity index 100%
rename from src/Shaders/compatibility.glsl
rename to src/Magnum/Shaders/compatibility.glsl
diff --git a/src/Shaders/generic.glsl b/src/Magnum/Shaders/generic.glsl
similarity index 100%
rename from src/Shaders/generic.glsl
rename to src/Magnum/Shaders/generic.glsl
diff --git a/src/Shaders/magnumShadersResourceImport.hpp b/src/Magnum/Shaders/magnumShadersResourceImport.hpp
similarity index 100%
rename from src/Shaders/magnumShadersResourceImport.hpp
rename to src/Magnum/Shaders/magnumShadersResourceImport.hpp
diff --git a/src/Shaders/magnumShadersVisibility.h b/src/Magnum/Shaders/magnumShadersVisibility.h
similarity index 100%
rename from src/Shaders/magnumShadersVisibility.h
rename to src/Magnum/Shaders/magnumShadersVisibility.h
diff --git a/src/Shaders/resources.conf b/src/Magnum/Shaders/resources.conf
similarity index 100%
rename from src/Shaders/resources.conf
rename to src/Magnum/Shaders/resources.conf
diff --git a/src/Shapes/AbstractShape.cpp b/src/Magnum/Shapes/AbstractShape.cpp
similarity index 100%
rename from src/Shapes/AbstractShape.cpp
rename to src/Magnum/Shapes/AbstractShape.cpp
diff --git a/src/Shapes/AbstractShape.h b/src/Magnum/Shapes/AbstractShape.h
similarity index 100%
rename from src/Shapes/AbstractShape.h
rename to src/Magnum/Shapes/AbstractShape.h
diff --git a/src/Shapes/AxisAlignedBox.cpp b/src/Magnum/Shapes/AxisAlignedBox.cpp
similarity index 100%
rename from src/Shapes/AxisAlignedBox.cpp
rename to src/Magnum/Shapes/AxisAlignedBox.cpp
diff --git a/src/Shapes/AxisAlignedBox.h b/src/Magnum/Shapes/AxisAlignedBox.h
similarity index 100%
rename from src/Shapes/AxisAlignedBox.h
rename to src/Magnum/Shapes/AxisAlignedBox.h
diff --git a/src/Shapes/Box.cpp b/src/Magnum/Shapes/Box.cpp
similarity index 100%
rename from src/Shapes/Box.cpp
rename to src/Magnum/Shapes/Box.cpp
diff --git a/src/Shapes/Box.h b/src/Magnum/Shapes/Box.h
similarity index 100%
rename from src/Shapes/Box.h
rename to src/Magnum/Shapes/Box.h
diff --git a/src/Shapes/CMakeLists.txt b/src/Magnum/Shapes/CMakeLists.txt
similarity index 100%
rename from src/Shapes/CMakeLists.txt
rename to src/Magnum/Shapes/CMakeLists.txt
diff --git a/src/Shapes/Capsule.cpp b/src/Magnum/Shapes/Capsule.cpp
similarity index 100%
rename from src/Shapes/Capsule.cpp
rename to src/Magnum/Shapes/Capsule.cpp
diff --git a/src/Shapes/Capsule.h b/src/Magnum/Shapes/Capsule.h
similarity index 100%
rename from src/Shapes/Capsule.h
rename to src/Magnum/Shapes/Capsule.h
diff --git a/src/Shapes/Collision.h b/src/Magnum/Shapes/Collision.h
similarity index 100%
rename from src/Shapes/Collision.h
rename to src/Magnum/Shapes/Collision.h
diff --git a/src/Shapes/Composition.cpp b/src/Magnum/Shapes/Composition.cpp
similarity index 100%
rename from src/Shapes/Composition.cpp
rename to src/Magnum/Shapes/Composition.cpp
diff --git a/src/Shapes/Composition.h b/src/Magnum/Shapes/Composition.h
similarity index 100%
rename from src/Shapes/Composition.h
rename to src/Magnum/Shapes/Composition.h
diff --git a/src/Shapes/Cylinder.cpp b/src/Magnum/Shapes/Cylinder.cpp
similarity index 100%
rename from src/Shapes/Cylinder.cpp
rename to src/Magnum/Shapes/Cylinder.cpp
diff --git a/src/Shapes/Cylinder.h b/src/Magnum/Shapes/Cylinder.h
similarity index 100%
rename from src/Shapes/Cylinder.h
rename to src/Magnum/Shapes/Cylinder.h
diff --git a/src/Shapes/Implementation/CollisionDispatch.cpp b/src/Magnum/Shapes/Implementation/CollisionDispatch.cpp
similarity index 100%
rename from src/Shapes/Implementation/CollisionDispatch.cpp
rename to src/Magnum/Shapes/Implementation/CollisionDispatch.cpp
diff --git a/src/Shapes/Implementation/CollisionDispatch.h b/src/Magnum/Shapes/Implementation/CollisionDispatch.h
similarity index 100%
rename from src/Shapes/Implementation/CollisionDispatch.h
rename to src/Magnum/Shapes/Implementation/CollisionDispatch.h
diff --git a/src/Shapes/Line.cpp b/src/Magnum/Shapes/Line.cpp
similarity index 100%
rename from src/Shapes/Line.cpp
rename to src/Magnum/Shapes/Line.cpp
diff --git a/src/Shapes/Line.h b/src/Magnum/Shapes/Line.h
similarity index 100%
rename from src/Shapes/Line.h
rename to src/Magnum/Shapes/Line.h
diff --git a/src/Shapes/LineSegment.h b/src/Magnum/Shapes/LineSegment.h
similarity index 100%
rename from src/Shapes/LineSegment.h
rename to src/Magnum/Shapes/LineSegment.h
diff --git a/src/Shapes/Plane.cpp b/src/Magnum/Shapes/Plane.cpp
similarity index 100%
rename from src/Shapes/Plane.cpp
rename to src/Magnum/Shapes/Plane.cpp
diff --git a/src/Shapes/Plane.h b/src/Magnum/Shapes/Plane.h
similarity index 100%
rename from src/Shapes/Plane.h
rename to src/Magnum/Shapes/Plane.h
diff --git a/src/Shapes/Point.cpp b/src/Magnum/Shapes/Point.cpp
similarity index 100%
rename from src/Shapes/Point.cpp
rename to src/Magnum/Shapes/Point.cpp
diff --git a/src/Shapes/Point.h b/src/Magnum/Shapes/Point.h
similarity index 100%
rename from src/Shapes/Point.h
rename to src/Magnum/Shapes/Point.h
diff --git a/src/Shapes/Shape.cpp b/src/Magnum/Shapes/Shape.cpp
similarity index 100%
rename from src/Shapes/Shape.cpp
rename to src/Magnum/Shapes/Shape.cpp
diff --git a/src/Shapes/Shape.h b/src/Magnum/Shapes/Shape.h
similarity index 100%
rename from src/Shapes/Shape.h
rename to src/Magnum/Shapes/Shape.h
diff --git a/src/Shapes/ShapeGroup.cpp b/src/Magnum/Shapes/ShapeGroup.cpp
similarity index 100%
rename from src/Shapes/ShapeGroup.cpp
rename to src/Magnum/Shapes/ShapeGroup.cpp
diff --git a/src/Shapes/ShapeGroup.h b/src/Magnum/Shapes/ShapeGroup.h
similarity index 100%
rename from src/Shapes/ShapeGroup.h
rename to src/Magnum/Shapes/ShapeGroup.h
diff --git a/src/Shapes/Shapes.h b/src/Magnum/Shapes/Shapes.h
similarity index 100%
rename from src/Shapes/Shapes.h
rename to src/Magnum/Shapes/Shapes.h
diff --git a/src/Shapes/Sphere.cpp b/src/Magnum/Shapes/Sphere.cpp
similarity index 100%
rename from src/Shapes/Sphere.cpp
rename to src/Magnum/Shapes/Sphere.cpp
diff --git a/src/Shapes/Sphere.h b/src/Magnum/Shapes/Sphere.h
similarity index 100%
rename from src/Shapes/Sphere.h
rename to src/Magnum/Shapes/Sphere.h
diff --git a/src/Shapes/Test/AxisAlignedBoxTest.cpp b/src/Magnum/Shapes/Test/AxisAlignedBoxTest.cpp
similarity index 100%
rename from src/Shapes/Test/AxisAlignedBoxTest.cpp
rename to src/Magnum/Shapes/Test/AxisAlignedBoxTest.cpp
diff --git a/src/Shapes/Test/BoxTest.cpp b/src/Magnum/Shapes/Test/BoxTest.cpp
similarity index 100%
rename from src/Shapes/Test/BoxTest.cpp
rename to src/Magnum/Shapes/Test/BoxTest.cpp
diff --git a/src/Shapes/Test/CMakeLists.txt b/src/Magnum/Shapes/Test/CMakeLists.txt
similarity index 100%
rename from src/Shapes/Test/CMakeLists.txt
rename to src/Magnum/Shapes/Test/CMakeLists.txt
diff --git a/src/Shapes/Test/CapsuleTest.cpp b/src/Magnum/Shapes/Test/CapsuleTest.cpp
similarity index 100%
rename from src/Shapes/Test/CapsuleTest.cpp
rename to src/Magnum/Shapes/Test/CapsuleTest.cpp
diff --git a/src/Shapes/Test/CollisionTest.cpp b/src/Magnum/Shapes/Test/CollisionTest.cpp
similarity index 100%
rename from src/Shapes/Test/CollisionTest.cpp
rename to src/Magnum/Shapes/Test/CollisionTest.cpp
diff --git a/src/Shapes/Test/CompositionTest.cpp b/src/Magnum/Shapes/Test/CompositionTest.cpp
similarity index 100%
rename from src/Shapes/Test/CompositionTest.cpp
rename to src/Magnum/Shapes/Test/CompositionTest.cpp
diff --git a/src/Shapes/Test/CylinderTest.cpp b/src/Magnum/Shapes/Test/CylinderTest.cpp
similarity index 100%
rename from src/Shapes/Test/CylinderTest.cpp
rename to src/Magnum/Shapes/Test/CylinderTest.cpp
diff --git a/src/Shapes/Test/LineTest.cpp b/src/Magnum/Shapes/Test/LineTest.cpp
similarity index 100%
rename from src/Shapes/Test/LineTest.cpp
rename to src/Magnum/Shapes/Test/LineTest.cpp
diff --git a/src/Shapes/Test/PlaneTest.cpp b/src/Magnum/Shapes/Test/PlaneTest.cpp
similarity index 100%
rename from src/Shapes/Test/PlaneTest.cpp
rename to src/Magnum/Shapes/Test/PlaneTest.cpp
diff --git a/src/Shapes/Test/PointTest.cpp b/src/Magnum/Shapes/Test/PointTest.cpp
similarity index 100%
rename from src/Shapes/Test/PointTest.cpp
rename to src/Magnum/Shapes/Test/PointTest.cpp
diff --git a/src/Shapes/Test/ShapeImplementationTest.cpp b/src/Magnum/Shapes/Test/ShapeImplementationTest.cpp
similarity index 100%
rename from src/Shapes/Test/ShapeImplementationTest.cpp
rename to src/Magnum/Shapes/Test/ShapeImplementationTest.cpp
diff --git a/src/Shapes/Test/ShapeTest.cpp b/src/Magnum/Shapes/Test/ShapeTest.cpp
similarity index 100%
rename from src/Shapes/Test/ShapeTest.cpp
rename to src/Magnum/Shapes/Test/ShapeTest.cpp
diff --git a/src/Shapes/Test/ShapeTestBase.h b/src/Magnum/Shapes/Test/ShapeTestBase.h
similarity index 100%
rename from src/Shapes/Test/ShapeTestBase.h
rename to src/Magnum/Shapes/Test/ShapeTestBase.h
diff --git a/src/Shapes/Test/SphereTest.cpp b/src/Magnum/Shapes/Test/SphereTest.cpp
similarity index 100%
rename from src/Shapes/Test/SphereTest.cpp
rename to src/Magnum/Shapes/Test/SphereTest.cpp
diff --git a/src/Shapes/magnumShapesVisibility.h b/src/Magnum/Shapes/magnumShapesVisibility.h
similarity index 100%
rename from src/Shapes/magnumShapesVisibility.h
rename to src/Magnum/Shapes/magnumShapesVisibility.h
diff --git a/src/Shapes/shapeImplementation.cpp b/src/Magnum/Shapes/shapeImplementation.cpp
similarity index 100%
rename from src/Shapes/shapeImplementation.cpp
rename to src/Magnum/Shapes/shapeImplementation.cpp
diff --git a/src/Shapes/shapeImplementation.h b/src/Magnum/Shapes/shapeImplementation.h
similarity index 100%
rename from src/Shapes/shapeImplementation.h
rename to src/Magnum/Shapes/shapeImplementation.h
diff --git a/src/Swizzle.h b/src/Magnum/Swizzle.h
similarity index 100%
rename from src/Swizzle.h
rename to src/Magnum/Swizzle.h
diff --git a/src/Test/AbstractImageTest.cpp b/src/Magnum/Test/AbstractImageTest.cpp
similarity index 100%
rename from src/Test/AbstractImageTest.cpp
rename to src/Magnum/Test/AbstractImageTest.cpp
diff --git a/src/Test/AbstractObjectGLTest.cpp b/src/Magnum/Test/AbstractObjectGLTest.cpp
similarity index 100%
rename from src/Test/AbstractObjectGLTest.cpp
rename to src/Magnum/Test/AbstractObjectGLTest.cpp
diff --git a/src/Test/AbstractOpenGLTester.h b/src/Magnum/Test/AbstractOpenGLTester.h
similarity index 100%
rename from src/Test/AbstractOpenGLTester.h
rename to src/Magnum/Test/AbstractOpenGLTester.h
diff --git a/src/Test/AbstractQueryGLTest.cpp b/src/Magnum/Test/AbstractQueryGLTest.cpp
similarity index 100%
rename from src/Test/AbstractQueryGLTest.cpp
rename to src/Magnum/Test/AbstractQueryGLTest.cpp
diff --git a/src/Test/AbstractShaderProgramGLTest.cpp b/src/Magnum/Test/AbstractShaderProgramGLTest.cpp
similarity index 100%
rename from src/Test/AbstractShaderProgramGLTest.cpp
rename to src/Magnum/Test/AbstractShaderProgramGLTest.cpp
diff --git a/src/Test/AbstractShaderProgramGLTestFiles/MyShader.frag b/src/Magnum/Test/AbstractShaderProgramGLTestFiles/MyShader.frag
similarity index 100%
rename from src/Test/AbstractShaderProgramGLTestFiles/MyShader.frag
rename to src/Magnum/Test/AbstractShaderProgramGLTestFiles/MyShader.frag
diff --git a/src/Test/AbstractShaderProgramGLTestFiles/MyShader.vert b/src/Magnum/Test/AbstractShaderProgramGLTestFiles/MyShader.vert
similarity index 100%
rename from src/Test/AbstractShaderProgramGLTestFiles/MyShader.vert
rename to src/Magnum/Test/AbstractShaderProgramGLTestFiles/MyShader.vert
diff --git a/src/Test/AbstractShaderProgramGLTestFiles/MyShaderFragmentOutputs.frag b/src/Magnum/Test/AbstractShaderProgramGLTestFiles/MyShaderFragmentOutputs.frag
similarity index 100%
rename from src/Test/AbstractShaderProgramGLTestFiles/MyShaderFragmentOutputs.frag
rename to src/Magnum/Test/AbstractShaderProgramGLTestFiles/MyShaderFragmentOutputs.frag
diff --git a/src/Test/AbstractShaderProgramGLTestFiles/resources.conf b/src/Magnum/Test/AbstractShaderProgramGLTestFiles/resources.conf
similarity index 100%
rename from src/Test/AbstractShaderProgramGLTestFiles/resources.conf
rename to src/Magnum/Test/AbstractShaderProgramGLTestFiles/resources.conf
diff --git a/src/Test/AbstractShaderProgramTest.cpp b/src/Magnum/Test/AbstractShaderProgramTest.cpp
similarity index 100%
rename from src/Test/AbstractShaderProgramTest.cpp
rename to src/Magnum/Test/AbstractShaderProgramTest.cpp
diff --git a/src/Test/AbstractTextureGLTest.cpp b/src/Magnum/Test/AbstractTextureGLTest.cpp
similarity index 100%
rename from src/Test/AbstractTextureGLTest.cpp
rename to src/Magnum/Test/AbstractTextureGLTest.cpp
diff --git a/src/Test/ArrayTest.cpp b/src/Magnum/Test/ArrayTest.cpp
similarity index 100%
rename from src/Test/ArrayTest.cpp
rename to src/Magnum/Test/ArrayTest.cpp
diff --git a/src/Test/BufferGLTest.cpp b/src/Magnum/Test/BufferGLTest.cpp
similarity index 100%
rename from src/Test/BufferGLTest.cpp
rename to src/Magnum/Test/BufferGLTest.cpp
diff --git a/src/Test/BufferImageGLTest.cpp b/src/Magnum/Test/BufferImageGLTest.cpp
similarity index 100%
rename from src/Test/BufferImageGLTest.cpp
rename to src/Magnum/Test/BufferImageGLTest.cpp
diff --git a/src/Test/BufferTextureGLTest.cpp b/src/Magnum/Test/BufferTextureGLTest.cpp
similarity index 100%
rename from src/Test/BufferTextureGLTest.cpp
rename to src/Magnum/Test/BufferTextureGLTest.cpp
diff --git a/src/Test/CMakeLists.txt b/src/Magnum/Test/CMakeLists.txt
similarity index 100%
rename from src/Test/CMakeLists.txt
rename to src/Magnum/Test/CMakeLists.txt
diff --git a/src/Test/ColorTest.cpp b/src/Magnum/Test/ColorTest.cpp
similarity index 100%
rename from src/Test/ColorTest.cpp
rename to src/Magnum/Test/ColorTest.cpp
diff --git a/src/Test/ContextGLTest.cpp b/src/Magnum/Test/ContextGLTest.cpp
similarity index 100%
rename from src/Test/ContextGLTest.cpp
rename to src/Magnum/Test/ContextGLTest.cpp
diff --git a/src/Test/CubeMapTextureArrayGLTest.cpp b/src/Magnum/Test/CubeMapTextureArrayGLTest.cpp
similarity index 100%
rename from src/Test/CubeMapTextureArrayGLTest.cpp
rename to src/Magnum/Test/CubeMapTextureArrayGLTest.cpp
diff --git a/src/Test/CubeMapTextureGLTest.cpp b/src/Magnum/Test/CubeMapTextureGLTest.cpp
similarity index 100%
rename from src/Test/CubeMapTextureGLTest.cpp
rename to src/Magnum/Test/CubeMapTextureGLTest.cpp
diff --git a/src/Test/DebugGLTest.cpp b/src/Magnum/Test/DebugGLTest.cpp
similarity index 100%
rename from src/Test/DebugGLTest.cpp
rename to src/Magnum/Test/DebugGLTest.cpp
diff --git a/src/Test/DebugMessageTest.cpp b/src/Magnum/Test/DebugMessageTest.cpp
similarity index 100%
rename from src/Test/DebugMessageTest.cpp
rename to src/Magnum/Test/DebugMessageTest.cpp
diff --git a/src/Test/DefaultFramebufferTest.cpp b/src/Magnum/Test/DefaultFramebufferTest.cpp
similarity index 100%
rename from src/Test/DefaultFramebufferTest.cpp
rename to src/Magnum/Test/DefaultFramebufferTest.cpp
diff --git a/src/Test/FramebufferGLTest.cpp b/src/Magnum/Test/FramebufferGLTest.cpp
similarity index 100%
rename from src/Test/FramebufferGLTest.cpp
rename to src/Magnum/Test/FramebufferGLTest.cpp
diff --git a/src/Test/FramebufferTest.cpp b/src/Magnum/Test/FramebufferTest.cpp
similarity index 100%
rename from src/Test/FramebufferTest.cpp
rename to src/Magnum/Test/FramebufferTest.cpp
diff --git a/src/Test/ImageReferenceTest.cpp b/src/Magnum/Test/ImageReferenceTest.cpp
similarity index 100%
rename from src/Test/ImageReferenceTest.cpp
rename to src/Magnum/Test/ImageReferenceTest.cpp
diff --git a/src/Test/ImageTest.cpp b/src/Magnum/Test/ImageTest.cpp
similarity index 100%
rename from src/Test/ImageTest.cpp
rename to src/Magnum/Test/ImageTest.cpp
diff --git a/src/Test/MeshGLTest.cpp b/src/Magnum/Test/MeshGLTest.cpp
similarity index 100%
rename from src/Test/MeshGLTest.cpp
rename to src/Magnum/Test/MeshGLTest.cpp
diff --git a/src/Test/MeshTest.cpp b/src/Magnum/Test/MeshTest.cpp
similarity index 100%
rename from src/Test/MeshTest.cpp
rename to src/Magnum/Test/MeshTest.cpp
diff --git a/src/Test/PrimitiveQueryGLTest.cpp b/src/Magnum/Test/PrimitiveQueryGLTest.cpp
similarity index 100%
rename from src/Test/PrimitiveQueryGLTest.cpp
rename to src/Magnum/Test/PrimitiveQueryGLTest.cpp
diff --git a/src/Test/QueryGLTestFiles/MyShader.frag b/src/Magnum/Test/QueryGLTestFiles/MyShader.frag
similarity index 100%
rename from src/Test/QueryGLTestFiles/MyShader.frag
rename to src/Magnum/Test/QueryGLTestFiles/MyShader.frag
diff --git a/src/Test/QueryGLTestFiles/MyShader.vert b/src/Magnum/Test/QueryGLTestFiles/MyShader.vert
similarity index 100%
rename from src/Test/QueryGLTestFiles/MyShader.vert
rename to src/Magnum/Test/QueryGLTestFiles/MyShader.vert
diff --git a/src/Test/QueryGLTestFiles/resources.conf b/src/Magnum/Test/QueryGLTestFiles/resources.conf
similarity index 100%
rename from src/Test/QueryGLTestFiles/resources.conf
rename to src/Magnum/Test/QueryGLTestFiles/resources.conf
diff --git a/src/Test/RenderbufferGLTest.cpp b/src/Magnum/Test/RenderbufferGLTest.cpp
similarity index 100%
rename from src/Test/RenderbufferGLTest.cpp
rename to src/Magnum/Test/RenderbufferGLTest.cpp
diff --git a/src/Test/RendererTest.cpp b/src/Magnum/Test/RendererTest.cpp
similarity index 100%
rename from src/Test/RendererTest.cpp
rename to src/Magnum/Test/RendererTest.cpp
diff --git a/src/Test/ResourceManagerTest.cpp b/src/Magnum/Test/ResourceManagerTest.cpp
similarity index 100%
rename from src/Test/ResourceManagerTest.cpp
rename to src/Magnum/Test/ResourceManagerTest.cpp
diff --git a/src/Test/SampleQueryGLTest.cpp b/src/Magnum/Test/SampleQueryGLTest.cpp
similarity index 100%
rename from src/Test/SampleQueryGLTest.cpp
rename to src/Magnum/Test/SampleQueryGLTest.cpp
diff --git a/src/Test/SamplerTest.cpp b/src/Magnum/Test/SamplerTest.cpp
similarity index 100%
rename from src/Test/SamplerTest.cpp
rename to src/Magnum/Test/SamplerTest.cpp
diff --git a/src/Test/ShaderGLTest.cpp b/src/Magnum/Test/ShaderGLTest.cpp
similarity index 100%
rename from src/Test/ShaderGLTest.cpp
rename to src/Magnum/Test/ShaderGLTest.cpp
diff --git a/src/Test/ShaderGLTestConfigure.h.cmake b/src/Magnum/Test/ShaderGLTestConfigure.h.cmake
similarity index 100%
rename from src/Test/ShaderGLTestConfigure.h.cmake
rename to src/Magnum/Test/ShaderGLTestConfigure.h.cmake
diff --git a/src/Test/ShaderGLTestFiles/shader.glsl b/src/Magnum/Test/ShaderGLTestFiles/shader.glsl
similarity index 100%
rename from src/Test/ShaderGLTestFiles/shader.glsl
rename to src/Magnum/Test/ShaderGLTestFiles/shader.glsl
diff --git a/src/Test/ShaderTest.cpp b/src/Magnum/Test/ShaderTest.cpp
similarity index 100%
rename from src/Test/ShaderTest.cpp
rename to src/Magnum/Test/ShaderTest.cpp
diff --git a/src/Test/TextureGLTest.cpp b/src/Magnum/Test/TextureGLTest.cpp
similarity index 100%
rename from src/Test/TextureGLTest.cpp
rename to src/Magnum/Test/TextureGLTest.cpp
diff --git a/src/Test/TimeQueryGLTest.cpp b/src/Magnum/Test/TimeQueryGLTest.cpp
similarity index 100%
rename from src/Test/TimeQueryGLTest.cpp
rename to src/Magnum/Test/TimeQueryGLTest.cpp
diff --git a/src/Test/VersionTest.cpp b/src/Magnum/Test/VersionTest.cpp
similarity index 100%
rename from src/Test/VersionTest.cpp
rename to src/Magnum/Test/VersionTest.cpp
diff --git a/src/Text/AbstractFont.cpp b/src/Magnum/Text/AbstractFont.cpp
similarity index 100%
rename from src/Text/AbstractFont.cpp
rename to src/Magnum/Text/AbstractFont.cpp
diff --git a/src/Text/AbstractFont.h b/src/Magnum/Text/AbstractFont.h
similarity index 100%
rename from src/Text/AbstractFont.h
rename to src/Magnum/Text/AbstractFont.h
diff --git a/src/Text/AbstractFontConverter.cpp b/src/Magnum/Text/AbstractFontConverter.cpp
similarity index 100%
rename from src/Text/AbstractFontConverter.cpp
rename to src/Magnum/Text/AbstractFontConverter.cpp
diff --git a/src/Text/AbstractFontConverter.h b/src/Magnum/Text/AbstractFontConverter.h
similarity index 100%
rename from src/Text/AbstractFontConverter.h
rename to src/Magnum/Text/AbstractFontConverter.h
diff --git a/src/Text/Alignment.h b/src/Magnum/Text/Alignment.h
similarity index 100%
rename from src/Text/Alignment.h
rename to src/Magnum/Text/Alignment.h
diff --git a/src/Text/CMakeLists.txt b/src/Magnum/Text/CMakeLists.txt
similarity index 100%
rename from src/Text/CMakeLists.txt
rename to src/Magnum/Text/CMakeLists.txt
diff --git a/src/Text/DistanceFieldGlyphCache.cpp b/src/Magnum/Text/DistanceFieldGlyphCache.cpp
similarity index 100%
rename from src/Text/DistanceFieldGlyphCache.cpp
rename to src/Magnum/Text/DistanceFieldGlyphCache.cpp
diff --git a/src/Text/DistanceFieldGlyphCache.h b/src/Magnum/Text/DistanceFieldGlyphCache.h
similarity index 100%
rename from src/Text/DistanceFieldGlyphCache.h
rename to src/Magnum/Text/DistanceFieldGlyphCache.h
diff --git a/src/Text/GlyphCache.cpp b/src/Magnum/Text/GlyphCache.cpp
similarity index 100%
rename from src/Text/GlyphCache.cpp
rename to src/Magnum/Text/GlyphCache.cpp
diff --git a/src/Text/GlyphCache.h b/src/Magnum/Text/GlyphCache.h
similarity index 100%
rename from src/Text/GlyphCache.h
rename to src/Magnum/Text/GlyphCache.h
diff --git a/src/Text/Renderer.cpp b/src/Magnum/Text/Renderer.cpp
similarity index 100%
rename from src/Text/Renderer.cpp
rename to src/Magnum/Text/Renderer.cpp
diff --git a/src/Text/Renderer.h b/src/Magnum/Text/Renderer.h
similarity index 100%
rename from src/Text/Renderer.h
rename to src/Magnum/Text/Renderer.h
diff --git a/src/Text/Test/AbstractFontConverterTest.cpp b/src/Magnum/Text/Test/AbstractFontConverterTest.cpp
similarity index 100%
rename from src/Text/Test/AbstractFontConverterTest.cpp
rename to src/Magnum/Text/Test/AbstractFontConverterTest.cpp
diff --git a/src/Text/Test/AbstractFontTest.cpp b/src/Magnum/Text/Test/AbstractFontTest.cpp
similarity index 100%
rename from src/Text/Test/AbstractFontTest.cpp
rename to src/Magnum/Text/Test/AbstractFontTest.cpp
diff --git a/src/Text/Test/AbstractLayouterTest.cpp b/src/Magnum/Text/Test/AbstractLayouterTest.cpp
similarity index 100%
rename from src/Text/Test/AbstractLayouterTest.cpp
rename to src/Magnum/Text/Test/AbstractLayouterTest.cpp
diff --git a/src/Text/Test/CMakeLists.txt b/src/Magnum/Text/Test/CMakeLists.txt
similarity index 100%
rename from src/Text/Test/CMakeLists.txt
rename to src/Magnum/Text/Test/CMakeLists.txt
diff --git a/src/Text/Test/GlyphCacheGLTest.cpp b/src/Magnum/Text/Test/GlyphCacheGLTest.cpp
similarity index 100%
rename from src/Text/Test/GlyphCacheGLTest.cpp
rename to src/Magnum/Text/Test/GlyphCacheGLTest.cpp
diff --git a/src/Text/Test/RendererGLTest.cpp b/src/Magnum/Text/Test/RendererGLTest.cpp
similarity index 100%
rename from src/Text/Test/RendererGLTest.cpp
rename to src/Magnum/Text/Test/RendererGLTest.cpp
diff --git a/src/Text/Test/data.bin b/src/Magnum/Text/Test/data.bin
similarity index 100%
rename from src/Text/Test/data.bin
rename to src/Magnum/Text/Test/data.bin
diff --git a/src/Text/Test/testConfigure.h.cmake b/src/Magnum/Text/Test/testConfigure.h.cmake
similarity index 100%
rename from src/Text/Test/testConfigure.h.cmake
rename to src/Magnum/Text/Test/testConfigure.h.cmake
diff --git a/src/Text/Text.h b/src/Magnum/Text/Text.h
similarity index 100%
rename from src/Text/Text.h
rename to src/Magnum/Text/Text.h
diff --git a/src/Text/TextRenderer.h b/src/Magnum/Text/TextRenderer.h
similarity index 100%
rename from src/Text/TextRenderer.h
rename to src/Magnum/Text/TextRenderer.h
diff --git a/src/Text/configure.h.cmake b/src/Magnum/Text/configure.h.cmake
similarity index 100%
rename from src/Text/configure.h.cmake
rename to src/Magnum/Text/configure.h.cmake
diff --git a/src/Text/fontconverter.cpp b/src/Magnum/Text/fontconverter.cpp
similarity index 100%
rename from src/Text/fontconverter.cpp
rename to src/Magnum/Text/fontconverter.cpp
diff --git a/src/Text/magnumTextVisibility.h b/src/Magnum/Text/magnumTextVisibility.h
similarity index 100%
rename from src/Text/magnumTextVisibility.h
rename to src/Magnum/Text/magnumTextVisibility.h
diff --git a/src/Texture.h b/src/Magnum/Texture.h
similarity index 100%
rename from src/Texture.h
rename to src/Magnum/Texture.h
diff --git a/src/TextureFormat.h b/src/Magnum/TextureFormat.h
similarity index 100%
rename from src/TextureFormat.h
rename to src/Magnum/TextureFormat.h
diff --git a/src/TextureTools/Atlas.cpp b/src/Magnum/TextureTools/Atlas.cpp
similarity index 100%
rename from src/TextureTools/Atlas.cpp
rename to src/Magnum/TextureTools/Atlas.cpp
diff --git a/src/TextureTools/Atlas.h b/src/Magnum/TextureTools/Atlas.h
similarity index 100%
rename from src/TextureTools/Atlas.h
rename to src/Magnum/TextureTools/Atlas.h
diff --git a/src/TextureTools/CMakeLists.txt b/src/Magnum/TextureTools/CMakeLists.txt
similarity index 100%
rename from src/TextureTools/CMakeLists.txt
rename to src/Magnum/TextureTools/CMakeLists.txt
diff --git a/src/TextureTools/DistanceField.cpp b/src/Magnum/TextureTools/DistanceField.cpp
similarity index 100%
rename from src/TextureTools/DistanceField.cpp
rename to src/Magnum/TextureTools/DistanceField.cpp
diff --git a/src/TextureTools/DistanceField.h b/src/Magnum/TextureTools/DistanceField.h
similarity index 100%
rename from src/TextureTools/DistanceField.h
rename to src/Magnum/TextureTools/DistanceField.h
diff --git a/src/TextureTools/DistanceFieldShader.frag b/src/Magnum/TextureTools/DistanceFieldShader.frag
similarity index 100%
rename from src/TextureTools/DistanceFieldShader.frag
rename to src/Magnum/TextureTools/DistanceFieldShader.frag
diff --git a/src/TextureTools/DistanceFieldShader.vert b/src/Magnum/TextureTools/DistanceFieldShader.vert
similarity index 100%
rename from src/TextureTools/DistanceFieldShader.vert
rename to src/Magnum/TextureTools/DistanceFieldShader.vert
diff --git a/src/TextureTools/Test/AtlasTest.cpp b/src/Magnum/TextureTools/Test/AtlasTest.cpp
similarity index 100%
rename from src/TextureTools/Test/AtlasTest.cpp
rename to src/Magnum/TextureTools/Test/AtlasTest.cpp
diff --git a/src/TextureTools/Test/CMakeLists.txt b/src/Magnum/TextureTools/Test/CMakeLists.txt
similarity index 100%
rename from src/TextureTools/Test/CMakeLists.txt
rename to src/Magnum/TextureTools/Test/CMakeLists.txt
diff --git a/src/TextureTools/configure.h.cmake b/src/Magnum/TextureTools/configure.h.cmake
similarity index 100%
rename from src/TextureTools/configure.h.cmake
rename to src/Magnum/TextureTools/configure.h.cmake
diff --git a/src/TextureTools/distancefieldconverter.cpp b/src/Magnum/TextureTools/distancefieldconverter.cpp
similarity index 100%
rename from src/TextureTools/distancefieldconverter.cpp
rename to src/Magnum/TextureTools/distancefieldconverter.cpp
diff --git a/src/TextureTools/magnumTextureToolsResourceImport.hpp b/src/Magnum/TextureTools/magnumTextureToolsResourceImport.hpp
similarity index 100%
rename from src/TextureTools/magnumTextureToolsResourceImport.hpp
rename to src/Magnum/TextureTools/magnumTextureToolsResourceImport.hpp
diff --git a/src/TextureTools/magnumTextureToolsVisibility.h b/src/Magnum/TextureTools/magnumTextureToolsVisibility.h
similarity index 100%
rename from src/TextureTools/magnumTextureToolsVisibility.h
rename to src/Magnum/TextureTools/magnumTextureToolsVisibility.h
diff --git a/src/TextureTools/resources.conf b/src/Magnum/TextureTools/resources.conf
similarity index 100%
rename from src/TextureTools/resources.conf
rename to src/Magnum/TextureTools/resources.conf
diff --git a/src/Timeline.cpp b/src/Magnum/Timeline.cpp
similarity index 100%
rename from src/Timeline.cpp
rename to src/Magnum/Timeline.cpp
diff --git a/src/Timeline.h b/src/Magnum/Timeline.h
similarity index 100%
rename from src/Timeline.h
rename to src/Magnum/Timeline.h
diff --git a/src/Trade/AbstractImageConverter.cpp b/src/Magnum/Trade/AbstractImageConverter.cpp
similarity index 100%
rename from src/Trade/AbstractImageConverter.cpp
rename to src/Magnum/Trade/AbstractImageConverter.cpp
diff --git a/src/Trade/AbstractImageConverter.h b/src/Magnum/Trade/AbstractImageConverter.h
similarity index 100%
rename from src/Trade/AbstractImageConverter.h
rename to src/Magnum/Trade/AbstractImageConverter.h
diff --git a/src/Trade/AbstractImporter.cpp b/src/Magnum/Trade/AbstractImporter.cpp
similarity index 100%
rename from src/Trade/AbstractImporter.cpp
rename to src/Magnum/Trade/AbstractImporter.cpp
diff --git a/src/Trade/AbstractImporter.h b/src/Magnum/Trade/AbstractImporter.h
similarity index 100%
rename from src/Trade/AbstractImporter.h
rename to src/Magnum/Trade/AbstractImporter.h
diff --git a/src/Trade/AbstractMaterialData.cpp b/src/Magnum/Trade/AbstractMaterialData.cpp
similarity index 100%
rename from src/Trade/AbstractMaterialData.cpp
rename to src/Magnum/Trade/AbstractMaterialData.cpp
diff --git a/src/Trade/AbstractMaterialData.h b/src/Magnum/Trade/AbstractMaterialData.h
similarity index 100%
rename from src/Trade/AbstractMaterialData.h
rename to src/Magnum/Trade/AbstractMaterialData.h
diff --git a/src/Trade/CMakeLists.txt b/src/Magnum/Trade/CMakeLists.txt
similarity index 100%
rename from src/Trade/CMakeLists.txt
rename to src/Magnum/Trade/CMakeLists.txt
diff --git a/src/Trade/CameraData.h b/src/Magnum/Trade/CameraData.h
similarity index 100%
rename from src/Trade/CameraData.h
rename to src/Magnum/Trade/CameraData.h
diff --git a/src/Trade/ImageData.h b/src/Magnum/Trade/ImageData.h
similarity index 100%
rename from src/Trade/ImageData.h
rename to src/Magnum/Trade/ImageData.h
diff --git a/src/Trade/LightData.h b/src/Magnum/Trade/LightData.h
similarity index 100%
rename from src/Trade/LightData.h
rename to src/Magnum/Trade/LightData.h
diff --git a/src/Trade/MeshData2D.cpp b/src/Magnum/Trade/MeshData2D.cpp
similarity index 100%
rename from src/Trade/MeshData2D.cpp
rename to src/Magnum/Trade/MeshData2D.cpp
diff --git a/src/Trade/MeshData2D.h b/src/Magnum/Trade/MeshData2D.h
similarity index 100%
rename from src/Trade/MeshData2D.h
rename to src/Magnum/Trade/MeshData2D.h
diff --git a/src/Trade/MeshData3D.cpp b/src/Magnum/Trade/MeshData3D.cpp
similarity index 100%
rename from src/Trade/MeshData3D.cpp
rename to src/Magnum/Trade/MeshData3D.cpp
diff --git a/src/Trade/MeshData3D.h b/src/Magnum/Trade/MeshData3D.h
similarity index 100%
rename from src/Trade/MeshData3D.h
rename to src/Magnum/Trade/MeshData3D.h
diff --git a/src/Trade/MeshObjectData2D.cpp b/src/Magnum/Trade/MeshObjectData2D.cpp
similarity index 100%
rename from src/Trade/MeshObjectData2D.cpp
rename to src/Magnum/Trade/MeshObjectData2D.cpp
diff --git a/src/Trade/MeshObjectData2D.h b/src/Magnum/Trade/MeshObjectData2D.h
similarity index 100%
rename from src/Trade/MeshObjectData2D.h
rename to src/Magnum/Trade/MeshObjectData2D.h
diff --git a/src/Trade/MeshObjectData3D.cpp b/src/Magnum/Trade/MeshObjectData3D.cpp
similarity index 100%
rename from src/Trade/MeshObjectData3D.cpp
rename to src/Magnum/Trade/MeshObjectData3D.cpp
diff --git a/src/Trade/MeshObjectData3D.h b/src/Magnum/Trade/MeshObjectData3D.h
similarity index 100%
rename from src/Trade/MeshObjectData3D.h
rename to src/Magnum/Trade/MeshObjectData3D.h
diff --git a/src/Trade/ObjectData2D.cpp b/src/Magnum/Trade/ObjectData2D.cpp
similarity index 100%
rename from src/Trade/ObjectData2D.cpp
rename to src/Magnum/Trade/ObjectData2D.cpp
diff --git a/src/Trade/ObjectData2D.h b/src/Magnum/Trade/ObjectData2D.h
similarity index 100%
rename from src/Trade/ObjectData2D.h
rename to src/Magnum/Trade/ObjectData2D.h
diff --git a/src/Trade/ObjectData3D.cpp b/src/Magnum/Trade/ObjectData3D.cpp
similarity index 100%
rename from src/Trade/ObjectData3D.cpp
rename to src/Magnum/Trade/ObjectData3D.cpp
diff --git a/src/Trade/ObjectData3D.h b/src/Magnum/Trade/ObjectData3D.h
similarity index 100%
rename from src/Trade/ObjectData3D.h
rename to src/Magnum/Trade/ObjectData3D.h
diff --git a/src/Trade/PhongMaterialData.cpp b/src/Magnum/Trade/PhongMaterialData.cpp
similarity index 100%
rename from src/Trade/PhongMaterialData.cpp
rename to src/Magnum/Trade/PhongMaterialData.cpp
diff --git a/src/Trade/PhongMaterialData.h b/src/Magnum/Trade/PhongMaterialData.h
similarity index 100%
rename from src/Trade/PhongMaterialData.h
rename to src/Magnum/Trade/PhongMaterialData.h
diff --git a/src/Trade/SceneData.cpp b/src/Magnum/Trade/SceneData.cpp
similarity index 100%
rename from src/Trade/SceneData.cpp
rename to src/Magnum/Trade/SceneData.cpp
diff --git a/src/Trade/SceneData.h b/src/Magnum/Trade/SceneData.h
similarity index 100%
rename from src/Trade/SceneData.h
rename to src/Magnum/Trade/SceneData.h
diff --git a/src/Trade/Test/AbstractImageConverterTest.cpp b/src/Magnum/Trade/Test/AbstractImageConverterTest.cpp
similarity index 100%
rename from src/Trade/Test/AbstractImageConverterTest.cpp
rename to src/Magnum/Trade/Test/AbstractImageConverterTest.cpp
diff --git a/src/Trade/Test/AbstractImporterTest.cpp b/src/Magnum/Trade/Test/AbstractImporterTest.cpp
similarity index 100%
rename from src/Trade/Test/AbstractImporterTest.cpp
rename to src/Magnum/Trade/Test/AbstractImporterTest.cpp
diff --git a/src/Trade/Test/AbstractMaterialDataTest.cpp b/src/Magnum/Trade/Test/AbstractMaterialDataTest.cpp
similarity index 100%
rename from src/Trade/Test/AbstractMaterialDataTest.cpp
rename to src/Magnum/Trade/Test/AbstractMaterialDataTest.cpp
diff --git a/src/Trade/Test/CMakeLists.txt b/src/Magnum/Trade/Test/CMakeLists.txt
similarity index 100%
rename from src/Trade/Test/CMakeLists.txt
rename to src/Magnum/Trade/Test/CMakeLists.txt
diff --git a/src/Trade/Test/ImageDataTest.cpp b/src/Magnum/Trade/Test/ImageDataTest.cpp
similarity index 100%
rename from src/Trade/Test/ImageDataTest.cpp
rename to src/Magnum/Trade/Test/ImageDataTest.cpp
diff --git a/src/Trade/Test/ObjectData2DTest.cpp b/src/Magnum/Trade/Test/ObjectData2DTest.cpp
similarity index 100%
rename from src/Trade/Test/ObjectData2DTest.cpp
rename to src/Magnum/Trade/Test/ObjectData2DTest.cpp
diff --git a/src/Trade/Test/ObjectData3DTest.cpp b/src/Magnum/Trade/Test/ObjectData3DTest.cpp
similarity index 100%
rename from src/Trade/Test/ObjectData3DTest.cpp
rename to src/Magnum/Trade/Test/ObjectData3DTest.cpp
diff --git a/src/Trade/Test/TextureDataTest.cpp b/src/Magnum/Trade/Test/TextureDataTest.cpp
similarity index 100%
rename from src/Trade/Test/TextureDataTest.cpp
rename to src/Magnum/Trade/Test/TextureDataTest.cpp
diff --git a/src/Trade/Test/file.bin b/src/Magnum/Trade/Test/file.bin
similarity index 100%
rename from src/Trade/Test/file.bin
rename to src/Magnum/Trade/Test/file.bin
diff --git a/src/Trade/Test/testConfigure.h.cmake b/src/Magnum/Trade/Test/testConfigure.h.cmake
similarity index 100%
rename from src/Trade/Test/testConfigure.h.cmake
rename to src/Magnum/Trade/Test/testConfigure.h.cmake
diff --git a/src/Trade/TextureData.cpp b/src/Magnum/Trade/TextureData.cpp
similarity index 100%
rename from src/Trade/TextureData.cpp
rename to src/Magnum/Trade/TextureData.cpp
diff --git a/src/Trade/TextureData.h b/src/Magnum/Trade/TextureData.h
similarity index 100%
rename from src/Trade/TextureData.h
rename to src/Magnum/Trade/TextureData.h
diff --git a/src/Trade/Trade.h b/src/Magnum/Trade/Trade.h
similarity index 100%
rename from src/Trade/Trade.h
rename to src/Magnum/Trade/Trade.h
diff --git a/src/Types.h b/src/Magnum/Types.h
similarity index 100%
rename from src/Types.h
rename to src/Magnum/Types.h
diff --git a/src/Version.cpp b/src/Magnum/Version.cpp
similarity index 100%
rename from src/Version.cpp
rename to src/Magnum/Version.cpp
diff --git a/src/Version.h b/src/Magnum/Version.h
similarity index 100%
rename from src/Version.h
rename to src/Magnum/Version.h
diff --git a/src/magnumConfigure.h.cmake b/src/Magnum/magnumConfigure.h.cmake
similarity index 100%
rename from src/magnumConfigure.h.cmake
rename to src/Magnum/magnumConfigure.h.cmake
diff --git a/src/magnumVisibility.h b/src/Magnum/magnumVisibility.h
similarity index 100%
rename from src/magnumVisibility.h
rename to src/Magnum/magnumVisibility.h
diff --git a/external/CMakeLists.txt b/src/MagnumExternal/CMakeLists.txt
similarity index 100%
rename from external/CMakeLists.txt
rename to src/MagnumExternal/CMakeLists.txt
diff --git a/external/OpenGL/CMakeLists.txt b/src/MagnumExternal/OpenGL/CMakeLists.txt
similarity index 100%
rename from external/OpenGL/CMakeLists.txt
rename to src/MagnumExternal/OpenGL/CMakeLists.txt
diff --git a/external/OpenGL/GL/CMakeLists.txt b/src/MagnumExternal/OpenGL/GL/CMakeLists.txt
similarity index 100%
rename from external/OpenGL/GL/CMakeLists.txt
rename to src/MagnumExternal/OpenGL/GL/CMakeLists.txt
diff --git a/external/OpenGL/GL/README.md b/src/MagnumExternal/OpenGL/GL/README.md
similarity index 100%
rename from external/OpenGL/GL/README.md
rename to src/MagnumExternal/OpenGL/GL/README.md
diff --git a/external/OpenGL/GL/extensions.txt b/src/MagnumExternal/OpenGL/GL/extensions.txt
similarity index 100%
rename from external/OpenGL/GL/extensions.txt
rename to src/MagnumExternal/OpenGL/GL/extensions.txt
diff --git a/external/OpenGL/GL/gl_magnum.c b/src/MagnumExternal/OpenGL/GL/gl_magnum.c
similarity index 100%
rename from external/OpenGL/GL/gl_magnum.c
rename to src/MagnumExternal/OpenGL/GL/gl_magnum.c
diff --git a/external/OpenGL/GL/gl_magnum.h b/src/MagnumExternal/OpenGL/GL/gl_magnum.h
similarity index 100%
rename from external/OpenGL/GL/gl_magnum.h
rename to src/MagnumExternal/OpenGL/GL/gl_magnum.h
diff --git a/external/OpenGL/GLES2/CMakeLists.txt b/src/MagnumExternal/OpenGL/GLES2/CMakeLists.txt
similarity index 100%
rename from external/OpenGL/GLES2/CMakeLists.txt
rename to src/MagnumExternal/OpenGL/GLES2/CMakeLists.txt
diff --git a/external/OpenGL/GLES2/gl2.h b/src/MagnumExternal/OpenGL/GLES2/gl2.h
similarity index 100%
rename from external/OpenGL/GLES2/gl2.h
rename to src/MagnumExternal/OpenGL/GLES2/gl2.h
diff --git a/external/OpenGL/GLES2/gl2ext.h b/src/MagnumExternal/OpenGL/GLES2/gl2ext.h
similarity index 100%
rename from external/OpenGL/GLES2/gl2ext.h
rename to src/MagnumExternal/OpenGL/GLES2/gl2ext.h
diff --git a/external/OpenGL/GLES2/gl2platform.h b/src/MagnumExternal/OpenGL/GLES2/gl2platform.h
similarity index 100%
rename from external/OpenGL/GLES2/gl2platform.h
rename to src/MagnumExternal/OpenGL/GLES2/gl2platform.h
diff --git a/external/OpenGL/GLES3/CMakeLists.txt b/src/MagnumExternal/OpenGL/GLES3/CMakeLists.txt
similarity index 100%
rename from external/OpenGL/GLES3/CMakeLists.txt
rename to src/MagnumExternal/OpenGL/GLES3/CMakeLists.txt
diff --git a/external/OpenGL/GLES3/gl3.h b/src/MagnumExternal/OpenGL/GLES3/gl3.h
similarity index 100%
rename from external/OpenGL/GLES3/gl3.h
rename to src/MagnumExternal/OpenGL/GLES3/gl3.h
diff --git a/external/OpenGL/GLES3/gl3platform.h b/src/MagnumExternal/OpenGL/GLES3/gl3platform.h
similarity index 100%
rename from external/OpenGL/GLES3/gl3platform.h
rename to src/MagnumExternal/OpenGL/GLES3/gl3platform.h
diff --git a/external/OpenGL/KHR/CMakeLists.txt b/src/MagnumExternal/OpenGL/KHR/CMakeLists.txt
similarity index 100%
rename from external/OpenGL/KHR/CMakeLists.txt
rename to src/MagnumExternal/OpenGL/KHR/CMakeLists.txt
diff --git a/external/OpenGL/KHR/khrplatform.h b/src/MagnumExternal/OpenGL/KHR/khrplatform.h
similarity index 100%
rename from external/OpenGL/KHR/khrplatform.h
rename to src/MagnumExternal/OpenGL/KHR/khrplatform.h
diff --git a/external/Optional/CMakeLists.txt b/src/MagnumExternal/Optional/CMakeLists.txt
similarity index 100%
rename from external/Optional/CMakeLists.txt
rename to src/MagnumExternal/Optional/CMakeLists.txt
diff --git a/external/Optional/LICENSE_1_0.txt b/src/MagnumExternal/Optional/LICENSE_1_0.txt
similarity index 100%
rename from external/Optional/LICENSE_1_0.txt
rename to src/MagnumExternal/Optional/LICENSE_1_0.txt
diff --git a/external/Optional/optional.hpp b/src/MagnumExternal/Optional/optional.hpp
similarity index 100%
rename from external/Optional/optional.hpp
rename to src/MagnumExternal/Optional/optional.hpp
diff --git a/src/Plugins/CMakeLists.txt b/src/MagnumPlugins/CMakeLists.txt
similarity index 100%
rename from src/Plugins/CMakeLists.txt
rename to src/MagnumPlugins/CMakeLists.txt
diff --git a/src/Plugins/MagnumFont/CMakeLists.txt b/src/MagnumPlugins/MagnumFont/CMakeLists.txt
similarity index 100%
rename from src/Plugins/MagnumFont/CMakeLists.txt
rename to src/MagnumPlugins/MagnumFont/CMakeLists.txt
diff --git a/src/Plugins/MagnumFont/MagnumFont.conf b/src/MagnumPlugins/MagnumFont/MagnumFont.conf
similarity index 100%
rename from src/Plugins/MagnumFont/MagnumFont.conf
rename to src/MagnumPlugins/MagnumFont/MagnumFont.conf
diff --git a/src/Plugins/MagnumFont/MagnumFont.cpp b/src/MagnumPlugins/MagnumFont/MagnumFont.cpp
similarity index 100%
rename from src/Plugins/MagnumFont/MagnumFont.cpp
rename to src/MagnumPlugins/MagnumFont/MagnumFont.cpp
diff --git a/src/Plugins/MagnumFont/MagnumFont.h b/src/MagnumPlugins/MagnumFont/MagnumFont.h
similarity index 100%
rename from src/Plugins/MagnumFont/MagnumFont.h
rename to src/MagnumPlugins/MagnumFont/MagnumFont.h
diff --git a/src/Plugins/MagnumFont/Test/CMakeLists.txt b/src/MagnumPlugins/MagnumFont/Test/CMakeLists.txt
similarity index 100%
rename from src/Plugins/MagnumFont/Test/CMakeLists.txt
rename to src/MagnumPlugins/MagnumFont/Test/CMakeLists.txt
diff --git a/src/Plugins/MagnumFont/Test/MagnumFontGLTest.cpp b/src/MagnumPlugins/MagnumFont/Test/MagnumFontGLTest.cpp
similarity index 100%
rename from src/Plugins/MagnumFont/Test/MagnumFontGLTest.cpp
rename to src/MagnumPlugins/MagnumFont/Test/MagnumFontGLTest.cpp
diff --git a/src/Plugins/MagnumFont/Test/font.conf b/src/MagnumPlugins/MagnumFont/Test/font.conf
similarity index 100%
rename from src/Plugins/MagnumFont/Test/font.conf
rename to src/MagnumPlugins/MagnumFont/Test/font.conf
diff --git a/src/Plugins/MagnumFont/Test/font.tga b/src/MagnumPlugins/MagnumFont/Test/font.tga
similarity index 100%
rename from src/Plugins/MagnumFont/Test/font.tga
rename to src/MagnumPlugins/MagnumFont/Test/font.tga
diff --git a/src/Plugins/MagnumFont/Test/magnumFontTestConfigure.h.cmake b/src/MagnumPlugins/MagnumFont/Test/magnumFontTestConfigure.h.cmake
similarity index 100%
rename from src/Plugins/MagnumFont/Test/magnumFontTestConfigure.h.cmake
rename to src/MagnumPlugins/MagnumFont/Test/magnumFontTestConfigure.h.cmake
diff --git a/src/Plugins/MagnumFont/pluginRegistrationMagnumFont.cpp b/src/MagnumPlugins/MagnumFont/pluginRegistrationMagnumFont.cpp
similarity index 100%
rename from src/Plugins/MagnumFont/pluginRegistrationMagnumFont.cpp
rename to src/MagnumPlugins/MagnumFont/pluginRegistrationMagnumFont.cpp
diff --git a/src/Plugins/MagnumFontConverter/CMakeLists.txt b/src/MagnumPlugins/MagnumFontConverter/CMakeLists.txt
similarity index 100%
rename from src/Plugins/MagnumFontConverter/CMakeLists.txt
rename to src/MagnumPlugins/MagnumFontConverter/CMakeLists.txt
diff --git a/src/Plugins/MagnumFontConverter/MagnumFontConverter.conf b/src/MagnumPlugins/MagnumFontConverter/MagnumFontConverter.conf
similarity index 100%
rename from src/Plugins/MagnumFontConverter/MagnumFontConverter.conf
rename to src/MagnumPlugins/MagnumFontConverter/MagnumFontConverter.conf
diff --git a/src/Plugins/MagnumFontConverter/MagnumFontConverter.cpp b/src/MagnumPlugins/MagnumFontConverter/MagnumFontConverter.cpp
similarity index 100%
rename from src/Plugins/MagnumFontConverter/MagnumFontConverter.cpp
rename to src/MagnumPlugins/MagnumFontConverter/MagnumFontConverter.cpp
diff --git a/src/Plugins/MagnumFontConverter/MagnumFontConverter.h b/src/MagnumPlugins/MagnumFontConverter/MagnumFontConverter.h
similarity index 100%
rename from src/Plugins/MagnumFontConverter/MagnumFontConverter.h
rename to src/MagnumPlugins/MagnumFontConverter/MagnumFontConverter.h
diff --git a/src/Plugins/MagnumFontConverter/Test/CMakeLists.txt b/src/MagnumPlugins/MagnumFontConverter/Test/CMakeLists.txt
similarity index 100%
rename from src/Plugins/MagnumFontConverter/Test/CMakeLists.txt
rename to src/MagnumPlugins/MagnumFontConverter/Test/CMakeLists.txt
diff --git a/src/Plugins/MagnumFontConverter/Test/MagnumFontConverterGLTest.cpp b/src/MagnumPlugins/MagnumFontConverter/Test/MagnumFontConverterGLTest.cpp
similarity index 100%
rename from src/Plugins/MagnumFontConverter/Test/MagnumFontConverterGLTest.cpp
rename to src/MagnumPlugins/MagnumFontConverter/Test/MagnumFontConverterGLTest.cpp
diff --git a/src/Plugins/MagnumFontConverter/Test/magnumFontConverterTestConfigure.h.cmake b/src/MagnumPlugins/MagnumFontConverter/Test/magnumFontConverterTestConfigure.h.cmake
similarity index 100%
rename from src/Plugins/MagnumFontConverter/Test/magnumFontConverterTestConfigure.h.cmake
rename to src/MagnumPlugins/MagnumFontConverter/Test/magnumFontConverterTestConfigure.h.cmake
diff --git a/src/Plugins/MagnumFontConverter/pluginRegistrationMagnumFontConverter.cpp b/src/MagnumPlugins/MagnumFontConverter/pluginRegistrationMagnumFontConverter.cpp
similarity index 100%
rename from src/Plugins/MagnumFontConverter/pluginRegistrationMagnumFontConverter.cpp
rename to src/MagnumPlugins/MagnumFontConverter/pluginRegistrationMagnumFontConverter.cpp
diff --git a/src/Plugins/TgaImageConverter/CMakeLists.txt b/src/MagnumPlugins/TgaImageConverter/CMakeLists.txt
similarity index 100%
rename from src/Plugins/TgaImageConverter/CMakeLists.txt
rename to src/MagnumPlugins/TgaImageConverter/CMakeLists.txt
diff --git a/src/Plugins/TgaImageConverter/Test/CMakeLists.txt b/src/MagnumPlugins/TgaImageConverter/Test/CMakeLists.txt
similarity index 100%
rename from src/Plugins/TgaImageConverter/Test/CMakeLists.txt
rename to src/MagnumPlugins/TgaImageConverter/Test/CMakeLists.txt
diff --git a/src/Plugins/TgaImageConverter/Test/TgaImageConverterTest.cpp b/src/MagnumPlugins/TgaImageConverter/Test/TgaImageConverterTest.cpp
similarity index 100%
rename from src/Plugins/TgaImageConverter/Test/TgaImageConverterTest.cpp
rename to src/MagnumPlugins/TgaImageConverter/Test/TgaImageConverterTest.cpp
diff --git a/src/Plugins/TgaImageConverter/Test/configure.h.cmake b/src/MagnumPlugins/TgaImageConverter/Test/configure.h.cmake
similarity index 100%
rename from src/Plugins/TgaImageConverter/Test/configure.h.cmake
rename to src/MagnumPlugins/TgaImageConverter/Test/configure.h.cmake
diff --git a/src/Plugins/TgaImageConverter/TgaImageConverter.conf b/src/MagnumPlugins/TgaImageConverter/TgaImageConverter.conf
similarity index 100%
rename from src/Plugins/TgaImageConverter/TgaImageConverter.conf
rename to src/MagnumPlugins/TgaImageConverter/TgaImageConverter.conf
diff --git a/src/Plugins/TgaImageConverter/TgaImageConverter.cpp b/src/MagnumPlugins/TgaImageConverter/TgaImageConverter.cpp
similarity index 100%
rename from src/Plugins/TgaImageConverter/TgaImageConverter.cpp
rename to src/MagnumPlugins/TgaImageConverter/TgaImageConverter.cpp
diff --git a/src/Plugins/TgaImageConverter/TgaImageConverter.h b/src/MagnumPlugins/TgaImageConverter/TgaImageConverter.h
similarity index 100%
rename from src/Plugins/TgaImageConverter/TgaImageConverter.h
rename to src/MagnumPlugins/TgaImageConverter/TgaImageConverter.h
diff --git a/src/Plugins/TgaImageConverter/pluginRegistrationTgaImageConverter.cpp b/src/MagnumPlugins/TgaImageConverter/pluginRegistrationTgaImageConverter.cpp
similarity index 100%
rename from src/Plugins/TgaImageConverter/pluginRegistrationTgaImageConverter.cpp
rename to src/MagnumPlugins/TgaImageConverter/pluginRegistrationTgaImageConverter.cpp
diff --git a/src/Plugins/TgaImporter/CMakeLists.txt b/src/MagnumPlugins/TgaImporter/CMakeLists.txt
similarity index 100%
rename from src/Plugins/TgaImporter/CMakeLists.txt
rename to src/MagnumPlugins/TgaImporter/CMakeLists.txt
diff --git a/src/Plugins/TgaImporter/Test/CMakeLists.txt b/src/MagnumPlugins/TgaImporter/Test/CMakeLists.txt
similarity index 100%
rename from src/Plugins/TgaImporter/Test/CMakeLists.txt
rename to src/MagnumPlugins/TgaImporter/Test/CMakeLists.txt
diff --git a/src/Plugins/TgaImporter/Test/TgaImporterTest.cpp b/src/MagnumPlugins/TgaImporter/Test/TgaImporterTest.cpp
similarity index 100%
rename from src/Plugins/TgaImporter/Test/TgaImporterTest.cpp
rename to src/MagnumPlugins/TgaImporter/Test/TgaImporterTest.cpp
diff --git a/src/Plugins/TgaImporter/Test/configure.h.cmake b/src/MagnumPlugins/TgaImporter/Test/configure.h.cmake
similarity index 100%
rename from src/Plugins/TgaImporter/Test/configure.h.cmake
rename to src/MagnumPlugins/TgaImporter/Test/configure.h.cmake
diff --git a/src/Plugins/TgaImporter/Test/file.tga b/src/MagnumPlugins/TgaImporter/Test/file.tga
similarity index 100%
rename from src/Plugins/TgaImporter/Test/file.tga
rename to src/MagnumPlugins/TgaImporter/Test/file.tga
diff --git a/src/Plugins/TgaImporter/TgaHeader.h b/src/MagnumPlugins/TgaImporter/TgaHeader.h
similarity index 100%
rename from src/Plugins/TgaImporter/TgaHeader.h
rename to src/MagnumPlugins/TgaImporter/TgaHeader.h
diff --git a/src/Plugins/TgaImporter/TgaImporter.conf b/src/MagnumPlugins/TgaImporter/TgaImporter.conf
similarity index 100%
rename from src/Plugins/TgaImporter/TgaImporter.conf
rename to src/MagnumPlugins/TgaImporter/TgaImporter.conf
diff --git a/src/Plugins/TgaImporter/TgaImporter.cpp b/src/MagnumPlugins/TgaImporter/TgaImporter.cpp
similarity index 100%
rename from src/Plugins/TgaImporter/TgaImporter.cpp
rename to src/MagnumPlugins/TgaImporter/TgaImporter.cpp
diff --git a/src/Plugins/TgaImporter/TgaImporter.h b/src/MagnumPlugins/TgaImporter/TgaImporter.h
similarity index 100%
rename from src/Plugins/TgaImporter/TgaImporter.h
rename to src/MagnumPlugins/TgaImporter/TgaImporter.h
diff --git a/src/Plugins/TgaImporter/pluginRegistrationTgaImporter.cpp b/src/MagnumPlugins/TgaImporter/pluginRegistrationTgaImporter.cpp
similarity index 100%
rename from src/Plugins/TgaImporter/pluginRegistrationTgaImporter.cpp
rename to src/MagnumPlugins/TgaImporter/pluginRegistrationTgaImporter.cpp
diff --git a/src/Plugins/WavAudioImporter/CMakeLists.txt b/src/MagnumPlugins/WavAudioImporter/CMakeLists.txt
similarity index 100%
rename from src/Plugins/WavAudioImporter/CMakeLists.txt
rename to src/MagnumPlugins/WavAudioImporter/CMakeLists.txt
diff --git a/src/Plugins/WavAudioImporter/Test/CMakeLists.txt b/src/MagnumPlugins/WavAudioImporter/Test/CMakeLists.txt
similarity index 100%
rename from src/Plugins/WavAudioImporter/Test/CMakeLists.txt
rename to src/MagnumPlugins/WavAudioImporter/Test/CMakeLists.txt
diff --git a/src/Plugins/WavAudioImporter/Test/WavImporterTest.cpp b/src/MagnumPlugins/WavAudioImporter/Test/WavImporterTest.cpp
similarity index 100%
rename from src/Plugins/WavAudioImporter/Test/WavImporterTest.cpp
rename to src/MagnumPlugins/WavAudioImporter/Test/WavImporterTest.cpp
diff --git a/src/Plugins/WavAudioImporter/Test/configure.h.cmake b/src/MagnumPlugins/WavAudioImporter/Test/configure.h.cmake
similarity index 100%
rename from src/Plugins/WavAudioImporter/Test/configure.h.cmake
rename to src/MagnumPlugins/WavAudioImporter/Test/configure.h.cmake
diff --git a/src/Plugins/WavAudioImporter/Test/mono16.wav b/src/MagnumPlugins/WavAudioImporter/Test/mono16.wav
similarity index 100%
rename from src/Plugins/WavAudioImporter/Test/mono16.wav
rename to src/MagnumPlugins/WavAudioImporter/Test/mono16.wav
diff --git a/src/Plugins/WavAudioImporter/Test/stereo8.wav b/src/MagnumPlugins/WavAudioImporter/Test/stereo8.wav
similarity index 100%
rename from src/Plugins/WavAudioImporter/Test/stereo8.wav
rename to src/MagnumPlugins/WavAudioImporter/Test/stereo8.wav
diff --git a/src/Plugins/WavAudioImporter/Test/unsupportedChannelCount.wav b/src/MagnumPlugins/WavAudioImporter/Test/unsupportedChannelCount.wav
similarity index 100%
rename from src/Plugins/WavAudioImporter/Test/unsupportedChannelCount.wav
rename to src/MagnumPlugins/WavAudioImporter/Test/unsupportedChannelCount.wav
diff --git a/src/Plugins/WavAudioImporter/Test/unsupportedFormat.wav b/src/MagnumPlugins/WavAudioImporter/Test/unsupportedFormat.wav
similarity index 100%
rename from src/Plugins/WavAudioImporter/Test/unsupportedFormat.wav
rename to src/MagnumPlugins/WavAudioImporter/Test/unsupportedFormat.wav
diff --git a/src/Plugins/WavAudioImporter/Test/wrongSignature.wav b/src/MagnumPlugins/WavAudioImporter/Test/wrongSignature.wav
similarity index 100%
rename from src/Plugins/WavAudioImporter/Test/wrongSignature.wav
rename to src/MagnumPlugins/WavAudioImporter/Test/wrongSignature.wav
diff --git a/src/Plugins/WavAudioImporter/WavAudioImporter.conf b/src/MagnumPlugins/WavAudioImporter/WavAudioImporter.conf
similarity index 100%
rename from src/Plugins/WavAudioImporter/WavAudioImporter.conf
rename to src/MagnumPlugins/WavAudioImporter/WavAudioImporter.conf
diff --git a/src/Plugins/WavAudioImporter/WavHeader.h b/src/MagnumPlugins/WavAudioImporter/WavHeader.h
similarity index 100%
rename from src/Plugins/WavAudioImporter/WavHeader.h
rename to src/MagnumPlugins/WavAudioImporter/WavHeader.h
diff --git a/src/Plugins/WavAudioImporter/WavImporter.cpp b/src/MagnumPlugins/WavAudioImporter/WavImporter.cpp
similarity index 100%
rename from src/Plugins/WavAudioImporter/WavImporter.cpp
rename to src/MagnumPlugins/WavAudioImporter/WavImporter.cpp
diff --git a/src/Plugins/WavAudioImporter/WavImporter.h b/src/MagnumPlugins/WavAudioImporter/WavImporter.h
similarity index 100%
rename from src/Plugins/WavAudioImporter/WavImporter.h
rename to src/MagnumPlugins/WavAudioImporter/WavImporter.h
diff --git a/src/Plugins/WavAudioImporter/pluginRegistrationWavAudioImporter.cpp b/src/MagnumPlugins/WavAudioImporter/pluginRegistrationWavAudioImporter.cpp
similarity index 100%
rename from src/Plugins/WavAudioImporter/pluginRegistrationWavAudioImporter.cpp
rename to src/MagnumPlugins/WavAudioImporter/pluginRegistrationWavAudioImporter.cpp