diff --git a/library/CMakeLists.txt b/library/PolyVoxCore/CMakeLists.txt
similarity index 100%
rename from library/CMakeLists.txt
rename to library/PolyVoxCore/CMakeLists.txt
diff --git a/library/include/Block.h b/library/PolyVoxCore/include/Block.h
similarity index 100%
rename from library/include/Block.h
rename to library/PolyVoxCore/include/Block.h
diff --git a/library/include/Block.inl b/library/PolyVoxCore/include/Block.inl
similarity index 100%
rename from library/include/Block.inl
rename to library/PolyVoxCore/include/Block.inl
diff --git a/library/include/BlockVolume.h b/library/PolyVoxCore/include/BlockVolume.h
similarity index 100%
rename from library/include/BlockVolume.h
rename to library/PolyVoxCore/include/BlockVolume.h
diff --git a/library/include/BlockVolume.inl b/library/PolyVoxCore/include/BlockVolume.inl
similarity index 100%
rename from library/include/BlockVolume.inl
rename to library/PolyVoxCore/include/BlockVolume.inl
diff --git a/library/include/BlockVolumeIterator.h b/library/PolyVoxCore/include/BlockVolumeIterator.h
similarity index 100%
rename from library/include/BlockVolumeIterator.h
rename to library/PolyVoxCore/include/BlockVolumeIterator.h
diff --git a/library/include/BlockVolumeIterator.inl b/library/PolyVoxCore/include/BlockVolumeIterator.inl
similarity index 100%
rename from library/include/BlockVolumeIterator.inl
rename to library/PolyVoxCore/include/BlockVolumeIterator.inl
diff --git a/library/include/Constants.h b/library/PolyVoxCore/include/Constants.h
similarity index 100%
rename from library/include/Constants.h
rename to library/PolyVoxCore/include/Constants.h
diff --git a/library/include/Enums.h b/library/PolyVoxCore/include/Enums.h
similarity index 100%
rename from library/include/Enums.h
rename to library/PolyVoxCore/include/Enums.h
diff --git a/library/include/GradientEstimators.h b/library/PolyVoxCore/include/GradientEstimators.h
similarity index 100%
rename from library/include/GradientEstimators.h
rename to library/PolyVoxCore/include/GradientEstimators.h
diff --git a/library/include/GradientEstimators.inl b/library/PolyVoxCore/include/GradientEstimators.inl
similarity index 100%
rename from library/include/GradientEstimators.inl
rename to library/PolyVoxCore/include/GradientEstimators.inl
diff --git a/library/include/IndexedSurfacePatch.h b/library/PolyVoxCore/include/IndexedSurfacePatch.h
similarity index 100%
rename from library/include/IndexedSurfacePatch.h
rename to library/PolyVoxCore/include/IndexedSurfacePatch.h
diff --git a/library/include/LinearVolume.h b/library/PolyVoxCore/include/LinearVolume.h
similarity index 100%
rename from library/include/LinearVolume.h
rename to library/PolyVoxCore/include/LinearVolume.h
diff --git a/library/include/LinearVolume.inl b/library/PolyVoxCore/include/LinearVolume.inl
similarity index 100%
rename from library/include/LinearVolume.inl
rename to library/PolyVoxCore/include/LinearVolume.inl
diff --git a/library/include/MarchingCubesTables.h b/library/PolyVoxCore/include/MarchingCubesTables.h
similarity index 100%
rename from library/include/MarchingCubesTables.h
rename to library/PolyVoxCore/include/MarchingCubesTables.h
diff --git a/library/include/PolyVoxForwardDeclarations.h b/library/PolyVoxCore/include/PolyVoxForwardDeclarations.h
similarity index 100%
rename from library/include/PolyVoxForwardDeclarations.h
rename to library/PolyVoxCore/include/PolyVoxForwardDeclarations.h
diff --git a/library/include/Region.h b/library/PolyVoxCore/include/Region.h
similarity index 100%
rename from library/include/Region.h
rename to library/PolyVoxCore/include/Region.h
diff --git a/library/include/RegionGeometry.h b/library/PolyVoxCore/include/RegionGeometry.h
similarity index 100%
rename from library/include/RegionGeometry.h
rename to library/PolyVoxCore/include/RegionGeometry.h
diff --git a/library/include/SurfaceEdge.h b/library/PolyVoxCore/include/SurfaceEdge.h
similarity index 100%
rename from library/include/SurfaceEdge.h
rename to library/PolyVoxCore/include/SurfaceEdge.h
diff --git a/library/include/SurfaceExtractors.h b/library/PolyVoxCore/include/SurfaceExtractors.h
similarity index 100%
rename from library/include/SurfaceExtractors.h
rename to library/PolyVoxCore/include/SurfaceExtractors.h
diff --git a/library/include/SurfaceTriangle.h b/library/PolyVoxCore/include/SurfaceTriangle.h
similarity index 100%
rename from library/include/SurfaceTriangle.h
rename to library/PolyVoxCore/include/SurfaceTriangle.h
diff --git a/library/include/SurfaceTypes.h b/library/PolyVoxCore/include/SurfaceTypes.h
similarity index 100%
rename from library/include/SurfaceTypes.h
rename to library/PolyVoxCore/include/SurfaceTypes.h
diff --git a/library/include/SurfaceVertex.h b/library/PolyVoxCore/include/SurfaceVertex.h
similarity index 100%
rename from library/include/SurfaceVertex.h
rename to library/PolyVoxCore/include/SurfaceVertex.h
diff --git a/library/include/TypeDef.h b/library/PolyVoxCore/include/TypeDef.h
similarity index 100%
rename from library/include/TypeDef.h
rename to library/PolyVoxCore/include/TypeDef.h
diff --git a/library/include/Utility.h b/library/PolyVoxCore/include/Utility.h
similarity index 100%
rename from library/include/Utility.h
rename to library/PolyVoxCore/include/Utility.h
diff --git a/library/include/Vector.h b/library/PolyVoxCore/include/Vector.h
similarity index 100%
rename from library/include/Vector.h
rename to library/PolyVoxCore/include/Vector.h
diff --git a/library/include/Vector.inl b/library/PolyVoxCore/include/Vector.inl
similarity index 100%
rename from library/include/Vector.inl
rename to library/PolyVoxCore/include/Vector.inl
diff --git a/library/include/VolumeChangeTracker.h b/library/PolyVoxCore/include/VolumeChangeTracker.h
similarity index 100%
rename from library/include/VolumeChangeTracker.h
rename to library/PolyVoxCore/include/VolumeChangeTracker.h
diff --git a/library/source/IndexedSurfacePatch.cpp b/library/PolyVoxCore/source/IndexedSurfacePatch.cpp
similarity index 100%
rename from library/source/IndexedSurfacePatch.cpp
rename to library/PolyVoxCore/source/IndexedSurfacePatch.cpp
diff --git a/library/source/MarchingCubesTables.cpp b/library/PolyVoxCore/source/MarchingCubesTables.cpp
similarity index 100%
rename from library/source/MarchingCubesTables.cpp
rename to library/PolyVoxCore/source/MarchingCubesTables.cpp
diff --git a/library/source/Region.cpp b/library/PolyVoxCore/source/Region.cpp
similarity index 100%
rename from library/source/Region.cpp
rename to library/PolyVoxCore/source/Region.cpp
diff --git a/library/source/RegionGeometry.cpp b/library/PolyVoxCore/source/RegionGeometry.cpp
similarity index 100%
rename from library/source/RegionGeometry.cpp
rename to library/PolyVoxCore/source/RegionGeometry.cpp
diff --git a/library/source/SurfaceEdge.cpp b/library/PolyVoxCore/source/SurfaceEdge.cpp
similarity index 100%
rename from library/source/SurfaceEdge.cpp
rename to library/PolyVoxCore/source/SurfaceEdge.cpp
diff --git a/library/source/SurfaceExtractors.cpp b/library/PolyVoxCore/source/SurfaceExtractors.cpp
similarity index 100%
rename from library/source/SurfaceExtractors.cpp
rename to library/PolyVoxCore/source/SurfaceExtractors.cpp
diff --git a/library/source/SurfaceTriangle.cpp b/library/PolyVoxCore/source/SurfaceTriangle.cpp
similarity index 100%
rename from library/source/SurfaceTriangle.cpp
rename to library/PolyVoxCore/source/SurfaceTriangle.cpp
diff --git a/library/source/SurfaceVertex.cpp b/library/PolyVoxCore/source/SurfaceVertex.cpp
similarity index 100%
rename from library/source/SurfaceVertex.cpp
rename to library/PolyVoxCore/source/SurfaceVertex.cpp
diff --git a/library/source/Utility.cpp b/library/PolyVoxCore/source/Utility.cpp
similarity index 100%
rename from library/source/Utility.cpp
rename to library/PolyVoxCore/source/Utility.cpp
diff --git a/library/source/VolumeChangeTracker.cpp b/library/PolyVoxCore/source/VolumeChangeTracker.cpp
similarity index 100%
rename from library/source/VolumeChangeTracker.cpp
rename to library/PolyVoxCore/source/VolumeChangeTracker.cpp