diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5b2883a96..b6ec575f7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -151,7 +151,7 @@ endforeach()
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${SCRIPTS_CMAKE_DIR})
 set(CMAKE_VERBOSE_MAKEFILE ${VERBOSE})
-SET(CMAKE_COLOR_MAKEFILE ON)
+set(CMAKE_COLOR_MAKEFILE ON)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 if (${CMAKE_GENERATOR} MATCHES "Eclipse CDT4")
diff --git a/data/voxedit/ui/lang/en.tb.txt b/data/voxedit-ui/ui/lang/en.tb.txt
similarity index 100%
rename from data/voxedit/ui/lang/en.tb.txt
rename to data/voxedit-ui/ui/lang/en.tb.txt
diff --git a/data/voxedit/ui/skin/voxedit-add.png b/data/voxedit-ui/ui/skin/voxedit-add.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-add.png
rename to data/voxedit-ui/ui/skin/voxedit-add.png
diff --git a/data/voxedit/ui/skin/voxedit-add@288.png b/data/voxedit-ui/ui/skin/voxedit-add@288.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-add@288.png
rename to data/voxedit-ui/ui/skin/voxedit-add@288.png
diff --git a/data/voxedit/ui/skin/voxedit-anim-play-selected.png b/data/voxedit-ui/ui/skin/voxedit-anim-play-selected.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-anim-play-selected.png
rename to data/voxedit-ui/ui/skin/voxedit-anim-play-selected.png
diff --git a/data/voxedit/ui/skin/voxedit-anim-play-selected@288.png b/data/voxedit-ui/ui/skin/voxedit-anim-play-selected@288.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-anim-play-selected@288.png
rename to data/voxedit-ui/ui/skin/voxedit-anim-play-selected@288.png
diff --git a/data/voxedit/ui/skin/voxedit-anim-play.png b/data/voxedit-ui/ui/skin/voxedit-anim-play.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-anim-play.png
rename to data/voxedit-ui/ui/skin/voxedit-anim-play.png
diff --git a/data/voxedit/ui/skin/voxedit-anim-play@288.png b/data/voxedit-ui/ui/skin/voxedit-anim-play@288.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-anim-play@288.png
rename to data/voxedit-ui/ui/skin/voxedit-anim-play@288.png
diff --git a/data/voxedit/ui/skin/voxedit-animation-selected.png b/data/voxedit-ui/ui/skin/voxedit-animation-selected.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-animation-selected.png
rename to data/voxedit-ui/ui/skin/voxedit-animation-selected.png
diff --git a/data/voxedit/ui/skin/voxedit-animation-selected@288.png b/data/voxedit-ui/ui/skin/voxedit-animation-selected@288.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-animation-selected@288.png
rename to data/voxedit-ui/ui/skin/voxedit-animation-selected@288.png
diff --git a/data/voxedit/ui/skin/voxedit-animation.png b/data/voxedit-ui/ui/skin/voxedit-animation.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-animation.png
rename to data/voxedit-ui/ui/skin/voxedit-animation.png
diff --git a/data/voxedit/ui/skin/voxedit-animation@288.png b/data/voxedit-ui/ui/skin/voxedit-animation@288.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-animation@288.png
rename to data/voxedit-ui/ui/skin/voxedit-animation@288.png
diff --git a/data/voxedit/ui/skin/voxedit-axis-x.png b/data/voxedit-ui/ui/skin/voxedit-axis-x.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-axis-x.png
rename to data/voxedit-ui/ui/skin/voxedit-axis-x.png
diff --git a/data/voxedit/ui/skin/voxedit-axis-x@288.png b/data/voxedit-ui/ui/skin/voxedit-axis-x@288.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-axis-x@288.png
rename to data/voxedit-ui/ui/skin/voxedit-axis-x@288.png
diff --git a/data/voxedit/ui/skin/voxedit-axis-y.png b/data/voxedit-ui/ui/skin/voxedit-axis-y.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-axis-y.png
rename to data/voxedit-ui/ui/skin/voxedit-axis-y.png
diff --git a/data/voxedit/ui/skin/voxedit-axis-y@288.png b/data/voxedit-ui/ui/skin/voxedit-axis-y@288.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-axis-y@288.png
rename to data/voxedit-ui/ui/skin/voxedit-axis-y@288.png
diff --git a/data/voxedit/ui/skin/voxedit-axis-z.png b/data/voxedit-ui/ui/skin/voxedit-axis-z.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-axis-z.png
rename to data/voxedit-ui/ui/skin/voxedit-axis-z.png
diff --git a/data/voxedit/ui/skin/voxedit-axis-z@288.png b/data/voxedit-ui/ui/skin/voxedit-axis-z@288.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-axis-z@288.png
rename to data/voxedit-ui/ui/skin/voxedit-axis-z@288.png
diff --git a/data/voxedit/ui/skin/voxedit-color-picker.png b/data/voxedit-ui/ui/skin/voxedit-color-picker.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-color-picker.png
rename to data/voxedit-ui/ui/skin/voxedit-color-picker.png
diff --git a/data/voxedit/ui/skin/voxedit-color-picker@288.png b/data/voxedit-ui/ui/skin/voxedit-color-picker@288.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-color-picker@288.png
rename to data/voxedit-ui/ui/skin/voxedit-color-picker@288.png
diff --git a/data/voxedit/ui/skin/voxedit-color.png b/data/voxedit-ui/ui/skin/voxedit-color.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-color.png
rename to data/voxedit-ui/ui/skin/voxedit-color.png
diff --git a/data/voxedit/ui/skin/voxedit-color@288.png b/data/voxedit-ui/ui/skin/voxedit-color@288.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-color@288.png
rename to data/voxedit-ui/ui/skin/voxedit-color@288.png
diff --git a/data/voxedit/ui/skin/voxedit-colors.png b/data/voxedit-ui/ui/skin/voxedit-colors.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-colors.png
rename to data/voxedit-ui/ui/skin/voxedit-colors.png
diff --git a/data/voxedit/ui/skin/voxedit-colors@288.png b/data/voxedit-ui/ui/skin/voxedit-colors@288.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-colors@288.png
rename to data/voxedit-ui/ui/skin/voxedit-colors@288.png
diff --git a/data/voxedit/ui/skin/voxedit-crop.png b/data/voxedit-ui/ui/skin/voxedit-crop.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-crop.png
rename to data/voxedit-ui/ui/skin/voxedit-crop.png
diff --git a/data/voxedit/ui/skin/voxedit-crop@288.png b/data/voxedit-ui/ui/skin/voxedit-crop@288.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-crop@288.png
rename to data/voxedit-ui/ui/skin/voxedit-crop@288.png
diff --git a/data/voxedit/ui/skin/voxedit-delete.png b/data/voxedit-ui/ui/skin/voxedit-delete.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-delete.png
rename to data/voxedit-ui/ui/skin/voxedit-delete.png
diff --git a/data/voxedit/ui/skin/voxedit-delete@288.png b/data/voxedit-ui/ui/skin/voxedit-delete@288.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-delete@288.png
rename to data/voxedit-ui/ui/skin/voxedit-delete@288.png
diff --git a/data/voxedit/ui/skin/voxedit-export.png b/data/voxedit-ui/ui/skin/voxedit-export.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-export.png
rename to data/voxedit-ui/ui/skin/voxedit-export.png
diff --git a/data/voxedit/ui/skin/voxedit-export@288.png b/data/voxedit-ui/ui/skin/voxedit-export@288.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-export@288.png
rename to data/voxedit-ui/ui/skin/voxedit-export@288.png
diff --git a/data/voxedit/ui/skin/voxedit-extend.png b/data/voxedit-ui/ui/skin/voxedit-extend.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-extend.png
rename to data/voxedit-ui/ui/skin/voxedit-extend.png
diff --git a/data/voxedit/ui/skin/voxedit-extend@288.png b/data/voxedit-ui/ui/skin/voxedit-extend@288.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-extend@288.png
rename to data/voxedit-ui/ui/skin/voxedit-extend@288.png
diff --git a/data/voxedit/ui/skin/voxedit-flip-horizontal.png b/data/voxedit-ui/ui/skin/voxedit-flip-horizontal.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-flip-horizontal.png
rename to data/voxedit-ui/ui/skin/voxedit-flip-horizontal.png
diff --git a/data/voxedit/ui/skin/voxedit-flip-horizontal@288.png b/data/voxedit-ui/ui/skin/voxedit-flip-horizontal@288.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-flip-horizontal@288.png
rename to data/voxedit-ui/ui/skin/voxedit-flip-horizontal@288.png
diff --git a/data/voxedit/ui/skin/voxedit-flip-vertical.png b/data/voxedit-ui/ui/skin/voxedit-flip-vertical.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-flip-vertical.png
rename to data/voxedit-ui/ui/skin/voxedit-flip-vertical.png
diff --git a/data/voxedit/ui/skin/voxedit-flip-vertical@288.png b/data/voxedit-ui/ui/skin/voxedit-flip-vertical@288.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-flip-vertical@288.png
rename to data/voxedit-ui/ui/skin/voxedit-flip-vertical@288.png
diff --git a/data/voxedit/ui/skin/voxedit-import-palette.png b/data/voxedit-ui/ui/skin/voxedit-import-palette.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-import-palette.png
rename to data/voxedit-ui/ui/skin/voxedit-import-palette.png
diff --git a/data/voxedit/ui/skin/voxedit-import-palette@288.png b/data/voxedit-ui/ui/skin/voxedit-import-palette@288.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-import-palette@288.png
rename to data/voxedit-ui/ui/skin/voxedit-import-palette@288.png
diff --git a/data/voxedit/ui/skin/voxedit-load.png b/data/voxedit-ui/ui/skin/voxedit-load.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-load.png
rename to data/voxedit-ui/ui/skin/voxedit-load.png
diff --git a/data/voxedit/ui/skin/voxedit-load@288.png b/data/voxedit-ui/ui/skin/voxedit-load@288.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-load@288.png
rename to data/voxedit-ui/ui/skin/voxedit-load@288.png
diff --git a/data/voxedit/ui/skin/voxedit-lock-layer-selected.png b/data/voxedit-ui/ui/skin/voxedit-lock-layer-selected.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-lock-layer-selected.png
rename to data/voxedit-ui/ui/skin/voxedit-lock-layer-selected.png
diff --git a/data/voxedit/ui/skin/voxedit-lock-layer-selected@288.png b/data/voxedit-ui/ui/skin/voxedit-lock-layer-selected@288.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-lock-layer-selected@288.png
rename to data/voxedit-ui/ui/skin/voxedit-lock-layer-selected@288.png
diff --git a/data/voxedit/ui/skin/voxedit-lock-layer.png b/data/voxedit-ui/ui/skin/voxedit-lock-layer.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-lock-layer.png
rename to data/voxedit-ui/ui/skin/voxedit-lock-layer.png
diff --git a/data/voxedit/ui/skin/voxedit-lock-layer@288.png b/data/voxedit-ui/ui/skin/voxedit-lock-layer@288.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-lock-layer@288.png
rename to data/voxedit-ui/ui/skin/voxedit-lock-layer@288.png
diff --git a/data/voxedit/ui/skin/voxedit-move.png b/data/voxedit-ui/ui/skin/voxedit-move.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-move.png
rename to data/voxedit-ui/ui/skin/voxedit-move.png
diff --git a/data/voxedit/ui/skin/voxedit-move@288.png b/data/voxedit-ui/ui/skin/voxedit-move@288.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-move@288.png
rename to data/voxedit-ui/ui/skin/voxedit-move@288.png
diff --git a/data/voxedit/ui/skin/voxedit-new.png b/data/voxedit-ui/ui/skin/voxedit-new.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-new.png
rename to data/voxedit-ui/ui/skin/voxedit-new.png
diff --git a/data/voxedit/ui/skin/voxedit-new@288.png b/data/voxedit-ui/ui/skin/voxedit-new@288.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-new@288.png
rename to data/voxedit-ui/ui/skin/voxedit-new@288.png
diff --git a/data/voxedit/ui/skin/voxedit-options.png b/data/voxedit-ui/ui/skin/voxedit-options.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-options.png
rename to data/voxedit-ui/ui/skin/voxedit-options.png
diff --git a/data/voxedit/ui/skin/voxedit-options@288.png b/data/voxedit-ui/ui/skin/voxedit-options@288.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-options@288.png
rename to data/voxedit-ui/ui/skin/voxedit-options@288.png
diff --git a/data/voxedit/ui/skin/voxedit-override.png b/data/voxedit-ui/ui/skin/voxedit-override.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-override.png
rename to data/voxedit-ui/ui/skin/voxedit-override.png
diff --git a/data/voxedit/ui/skin/voxedit-override@288.png b/data/voxedit-ui/ui/skin/voxedit-override@288.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-override@288.png
rename to data/voxedit-ui/ui/skin/voxedit-override@288.png
diff --git a/data/voxedit/ui/skin/voxedit-quadview-selected.png b/data/voxedit-ui/ui/skin/voxedit-quadview-selected.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-quadview-selected.png
rename to data/voxedit-ui/ui/skin/voxedit-quadview-selected.png
diff --git a/data/voxedit/ui/skin/voxedit-quadview-selected@288.png b/data/voxedit-ui/ui/skin/voxedit-quadview-selected@288.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-quadview-selected@288.png
rename to data/voxedit-ui/ui/skin/voxedit-quadview-selected@288.png
diff --git a/data/voxedit/ui/skin/voxedit-quadview.png b/data/voxedit-ui/ui/skin/voxedit-quadview.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-quadview.png
rename to data/voxedit-ui/ui/skin/voxedit-quadview.png
diff --git a/data/voxedit/ui/skin/voxedit-quadview@288.png b/data/voxedit-ui/ui/skin/voxedit-quadview@288.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-quadview@288.png
rename to data/voxedit-ui/ui/skin/voxedit-quadview@288.png
diff --git a/data/voxedit/ui/skin/voxedit-quit.png b/data/voxedit-ui/ui/skin/voxedit-quit.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-quit.png
rename to data/voxedit-ui/ui/skin/voxedit-quit.png
diff --git a/data/voxedit/ui/skin/voxedit-quit@288.png b/data/voxedit-ui/ui/skin/voxedit-quit@288.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-quit@288.png
rename to data/voxedit-ui/ui/skin/voxedit-quit@288.png
diff --git a/data/voxedit/ui/skin/voxedit-reset-camera.png b/data/voxedit-ui/ui/skin/voxedit-reset-camera.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-reset-camera.png
rename to data/voxedit-ui/ui/skin/voxedit-reset-camera.png
diff --git a/data/voxedit/ui/skin/voxedit-reset-camera@288.png b/data/voxedit-ui/ui/skin/voxedit-reset-camera@288.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-reset-camera@288.png
rename to data/voxedit-ui/ui/skin/voxedit-reset-camera@288.png
diff --git a/data/voxedit/ui/skin/voxedit-rotate.png b/data/voxedit-ui/ui/skin/voxedit-rotate.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-rotate.png
rename to data/voxedit-ui/ui/skin/voxedit-rotate.png
diff --git a/data/voxedit/ui/skin/voxedit-rotate@288.png b/data/voxedit-ui/ui/skin/voxedit-rotate@288.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-rotate@288.png
rename to data/voxedit-ui/ui/skin/voxedit-rotate@288.png
diff --git a/data/voxedit/ui/skin/voxedit-save.png b/data/voxedit-ui/ui/skin/voxedit-save.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-save.png
rename to data/voxedit-ui/ui/skin/voxedit-save.png
diff --git a/data/voxedit/ui/skin/voxedit-save@288.png b/data/voxedit-ui/ui/skin/voxedit-save@288.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-save@288.png
rename to data/voxedit-ui/ui/skin/voxedit-save@288.png
diff --git a/data/voxedit/ui/skin/voxedit-settings.png b/data/voxedit-ui/ui/skin/voxedit-settings.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-settings.png
rename to data/voxedit-ui/ui/skin/voxedit-settings.png
diff --git a/data/voxedit/ui/skin/voxedit-settings@288.png b/data/voxedit-ui/ui/skin/voxedit-settings@288.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-settings@288.png
rename to data/voxedit-ui/ui/skin/voxedit-settings@288.png
diff --git a/data/voxedit/ui/skin/voxedit-shift.png b/data/voxedit-ui/ui/skin/voxedit-shift.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-shift.png
rename to data/voxedit-ui/ui/skin/voxedit-shift.png
diff --git a/data/voxedit/ui/skin/voxedit-shift@288.png b/data/voxedit-ui/ui/skin/voxedit-shift@288.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-shift@288.png
rename to data/voxedit-ui/ui/skin/voxedit-shift@288.png
diff --git a/data/voxedit/ui/skin/voxedit-show-grid-selected.png b/data/voxedit-ui/ui/skin/voxedit-show-grid-selected.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-show-grid-selected.png
rename to data/voxedit-ui/ui/skin/voxedit-show-grid-selected.png
diff --git a/data/voxedit/ui/skin/voxedit-show-grid-selected@288.png b/data/voxedit-ui/ui/skin/voxedit-show-grid-selected@288.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-show-grid-selected@288.png
rename to data/voxedit-ui/ui/skin/voxedit-show-grid-selected@288.png
diff --git a/data/voxedit/ui/skin/voxedit-show-grid.png b/data/voxedit-ui/ui/skin/voxedit-show-grid.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-show-grid.png
rename to data/voxedit-ui/ui/skin/voxedit-show-grid.png
diff --git a/data/voxedit/ui/skin/voxedit-show-grid@288.png b/data/voxedit-ui/ui/skin/voxedit-show-grid@288.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-show-grid@288.png
rename to data/voxedit-ui/ui/skin/voxedit-show-grid@288.png
diff --git a/data/voxedit/ui/skin/voxedit-skin.tb.txt b/data/voxedit-ui/ui/skin/voxedit-skin.tb.txt
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-skin.tb.txt
rename to data/voxedit-ui/ui/skin/voxedit-skin.tb.txt
diff --git a/data/voxedit/ui/skin/voxedit-tree.png b/data/voxedit-ui/ui/skin/voxedit-tree.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-tree.png
rename to data/voxedit-ui/ui/skin/voxedit-tree.png
diff --git a/data/voxedit/ui/skin/voxedit-tree@288.png b/data/voxedit-ui/ui/skin/voxedit-tree@288.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-tree@288.png
rename to data/voxedit-ui/ui/skin/voxedit-tree@288.png
diff --git a/data/voxedit/ui/skin/voxedit-tree_pine.png b/data/voxedit-ui/ui/skin/voxedit-tree_pine.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-tree_pine.png
rename to data/voxedit-ui/ui/skin/voxedit-tree_pine.png
diff --git a/data/voxedit/ui/skin/voxedit-tree_pine@288.png b/data/voxedit-ui/ui/skin/voxedit-tree_pine@288.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-tree_pine@288.png
rename to data/voxedit-ui/ui/skin/voxedit-tree_pine@288.png
diff --git a/data/voxedit/ui/skin/voxedit-undo-redo.png b/data/voxedit-ui/ui/skin/voxedit-undo-redo.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-undo-redo.png
rename to data/voxedit-ui/ui/skin/voxedit-undo-redo.png
diff --git a/data/voxedit/ui/skin/voxedit-undo-redo@288.png b/data/voxedit-ui/ui/skin/voxedit-undo-redo@288.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-undo-redo@288.png
rename to data/voxedit-ui/ui/skin/voxedit-undo-redo@288.png
diff --git a/data/voxedit/ui/skin/voxedit-up.png b/data/voxedit-ui/ui/skin/voxedit-up.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-up.png
rename to data/voxedit-ui/ui/skin/voxedit-up.png
diff --git a/data/voxedit/ui/skin/voxedit-up@288.png b/data/voxedit-ui/ui/skin/voxedit-up@288.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-up@288.png
rename to data/voxedit-ui/ui/skin/voxedit-up@288.png
diff --git a/data/voxedit/ui/skin/voxedit-visible-selected.png b/data/voxedit-ui/ui/skin/voxedit-visible-selected.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-visible-selected.png
rename to data/voxedit-ui/ui/skin/voxedit-visible-selected.png
diff --git a/data/voxedit/ui/skin/voxedit-visible-selected@288.png b/data/voxedit-ui/ui/skin/voxedit-visible-selected@288.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-visible-selected@288.png
rename to data/voxedit-ui/ui/skin/voxedit-visible-selected@288.png
diff --git a/data/voxedit/ui/skin/voxedit-visible.png b/data/voxedit-ui/ui/skin/voxedit-visible.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-visible.png
rename to data/voxedit-ui/ui/skin/voxedit-visible.png
diff --git a/data/voxedit/ui/skin/voxedit-visible@288.png b/data/voxedit-ui/ui/skin/voxedit-visible@288.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-visible@288.png
rename to data/voxedit-ui/ui/skin/voxedit-visible@288.png
diff --git a/data/voxedit/ui/skin/voxedit-voxel.png b/data/voxedit-ui/ui/skin/voxedit-voxel.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-voxel.png
rename to data/voxedit-ui/ui/skin/voxedit-voxel.png
diff --git a/data/voxedit/ui/skin/voxedit-voxel@288.png b/data/voxedit-ui/ui/skin/voxedit-voxel@288.png
similarity index 100%
rename from data/voxedit/ui/skin/voxedit-voxel@288.png
rename to data/voxedit-ui/ui/skin/voxedit-voxel@288.png
diff --git a/data/voxedit/ui/widget/voxedit-layer-item.tb.txt b/data/voxedit-ui/ui/widget/voxedit-layer-item.tb.txt
similarity index 100%
rename from data/voxedit/ui/widget/voxedit-layer-item.tb.txt
rename to data/voxedit-ui/ui/widget/voxedit-layer-item.tb.txt
diff --git a/data/voxedit/ui/widget/voxedit-layer.tb.txt b/data/voxedit-ui/ui/widget/voxedit-layer.tb.txt
similarity index 100%
rename from data/voxedit/ui/widget/voxedit-layer.tb.txt
rename to data/voxedit-ui/ui/widget/voxedit-layer.tb.txt
diff --git a/data/voxedit/ui/window/voxedit-layer-move.tb.txt b/data/voxedit-ui/ui/window/voxedit-layer-move.tb.txt
similarity index 100%
rename from data/voxedit/ui/window/voxedit-layer-move.tb.txt
rename to data/voxedit-ui/ui/window/voxedit-layer-move.tb.txt
diff --git a/data/voxedit/ui/window/voxedit-layer-rename.tb.txt b/data/voxedit-ui/ui/window/voxedit-layer-rename.tb.txt
similarity index 100%
rename from data/voxedit/ui/window/voxedit-layer-rename.tb.txt
rename to data/voxedit-ui/ui/window/voxedit-layer-rename.tb.txt
diff --git a/data/voxedit/ui/window/voxedit-layer.tb.txt b/data/voxedit-ui/ui/window/voxedit-layer.tb.txt
similarity index 100%
rename from data/voxedit/ui/window/voxedit-layer.tb.txt
rename to data/voxedit-ui/ui/window/voxedit-layer.tb.txt
diff --git a/data/voxedit/ui/window/voxedit-main.tb.txt b/data/voxedit-ui/ui/window/voxedit-main.tb.txt
similarity index 100%
rename from data/voxedit/ui/window/voxedit-main.tb.txt
rename to data/voxedit-ui/ui/window/voxedit-main.tb.txt
diff --git a/data/voxedit/ui/window/voxedit-palette-selector.tb.txt b/data/voxedit-ui/ui/window/voxedit-palette-selector.tb.txt
similarity index 100%
rename from data/voxedit/ui/window/voxedit-palette-selector.tb.txt
rename to data/voxedit-ui/ui/window/voxedit-palette-selector.tb.txt
diff --git a/data/voxedit/ui/window/voxedit-scene-settings.tb.txt b/data/voxedit-ui/ui/window/voxedit-scene-settings.tb.txt
similarity index 100%
rename from data/voxedit/ui/window/voxedit-scene-settings.tb.txt
rename to data/voxedit-ui/ui/window/voxedit-scene-settings.tb.txt
diff --git a/src/tools/voxedit/CMakeLists.txt b/src/tools/voxedit/CMakeLists.txt
index 7b26f3541..d25e4ec87 100644
--- a/src/tools/voxedit/CMakeLists.txt
+++ b/src/tools/voxedit/CMakeLists.txt
@@ -1,103 +1,17 @@
-add_subdirectory(voxedit-util)
+include_directories(modules)
+add_subdirectory(modules)
 
 project(voxedit)
 set(SRCS
-	ui/editorscene/Viewport.h ui/editorscene/Viewport.cpp
-
-	ui/palette/PaletteWidget.h ui/palette/PaletteWidget.cpp
-	ui/palette/PaletteSelector.h ui/palette/PaletteSelector.cpp
-
-	ui/settings/SceneSettingsWindow.h ui/settings/SceneSettingsWindow.cpp
-
-	ui/layer/AbstractLayerPopupWindow.h ui/layer/AbstractLayerPopupWindow.cpp
-	ui/layer/LayerWidget.h ui/layer/LayerWidget.cpp
-	ui/layer/LayerWindow.h ui/layer/LayerWindow.cpp
-	ui/layer/LayerMoveWindow.h
-	ui/layer/LayerRenameWindow.h
-
-	ui/VoxEditWindow.h ui/VoxEditWindow.cpp
-
 	VoxEdit.h VoxEdit.cpp
 )
 
-set(UI_WINDOWS
-	voxedit/ui/window/voxedit-layer-rename.tb.txt
-	voxedit/ui/window/voxedit-layer-move.tb.txt
-	voxedit/ui/window/voxedit-layer.tb.txt
-	voxedit/ui/window/voxedit-main.tb.txt
-	voxedit/ui/window/voxedit-palette-selector.tb.txt
-	voxedit/ui/window/voxedit-scene-settings.tb.txt
-)
-
-set(IMAGES
-	voxedit/ui/skin/voxedit-add
-	voxedit/ui/skin/voxedit-anim-play
-	voxedit/ui/skin/voxedit-anim-play-selected
-	voxedit/ui/skin/voxedit-animation
-	voxedit/ui/skin/voxedit-animation-selected
-	voxedit/ui/skin/voxedit-axis-x
-	voxedit/ui/skin/voxedit-axis-y
-	voxedit/ui/skin/voxedit-axis-z
-	voxedit/ui/skin/voxedit-color-picker
-	voxedit/ui/skin/voxedit-color
-	voxedit/ui/skin/voxedit-colors
-	voxedit/ui/skin/voxedit-crop
-	voxedit/ui/skin/voxedit-delete
-	voxedit/ui/skin/voxedit-export
-	voxedit/ui/skin/voxedit-extend
-	voxedit/ui/skin/voxedit-flip-horizontal
-	voxedit/ui/skin/voxedit-flip-vertical
-	voxedit/ui/skin/voxedit-import-palette
-	voxedit/ui/skin/voxedit-load
-	voxedit/ui/skin/voxedit-lock-layer
-	voxedit/ui/skin/voxedit-lock-layer-selected
-	voxedit/ui/skin/voxedit-move
-	voxedit/ui/skin/voxedit-new
-	voxedit/ui/skin/voxedit-options
-	voxedit/ui/skin/voxedit-override
-	voxedit/ui/skin/voxedit-quadview
-	voxedit/ui/skin/voxedit-quadview-selected
-	voxedit/ui/skin/voxedit-quit
-	voxedit/ui/skin/voxedit-undo-redo
-	voxedit/ui/skin/voxedit-reset-camera
-	voxedit/ui/skin/voxedit-rotate
-	voxedit/ui/skin/voxedit-save
-	voxedit/ui/skin/voxedit-shift
-	voxedit/ui/skin/voxedit-show-grid
-	voxedit/ui/skin/voxedit-show-grid-selected
-	voxedit/ui/skin/voxedit-tree_pine
-	voxedit/ui/skin/voxedit-tree
-	voxedit/ui/skin/voxedit-up
-	voxedit/ui/skin/voxedit-visible
-	voxedit/ui/skin/voxedit-visible-selected
-	voxedit/ui/skin/voxedit-voxel
-)
-
 set(FILES
-	${UI_WINDOWS}
-	voxedit/ui/skin/voxedit-skin.tb.txt
-	voxedit/ui/widget/voxedit-layer-item.tb.txt
-	voxedit/ui/widget/voxedit-layer.tb.txt
-	voxedit/ui/lang/en.tb.txt
-
 	voxedit/voxedit-keybindings.cfg
-
 	voxedit/scripts/test-import-plane.cfg
 	voxedit/scripts/test-layers.cfg
 	voxedit/scripts/test-animate.cfg
 )
 
-foreach(IMAGE ${IMAGES})
-	list(APPEND FILES ${IMAGE}.png)
-endforeach()
-set(DPIS "@288")
-foreach(DPI ${DPIS})
-	foreach(IMAGE ${IMAGES})
-		list(APPEND FILES ${IMAGE}${DPI}.png)
-	endforeach()
-endforeach()
-
 engine_add_executable(TARGET ${PROJECT_NAME} SRCS ${SRCS} FILES ${FILES} WINDOWED)
-engine_target_link_libraries(TARGET ${PROJECT_NAME} DEPENDENCIES turbobadger voxedit-util)
-include_directories(.)
-check_ui_turbobadger(${PROJECT_NAME} ${UI_WINDOWS})
+engine_target_link_libraries(TARGET ${PROJECT_NAME} DEPENDENCIES voxedit-ui voxedit-util)
diff --git a/src/tools/voxedit/VoxEdit.cpp b/src/tools/voxedit/VoxEdit.cpp
index 9cf433a8e..205442675 100644
--- a/src/tools/voxedit/VoxEdit.cpp
+++ b/src/tools/voxedit/VoxEdit.cpp
@@ -4,6 +4,7 @@
 
 #include "VoxEdit.h"
 #include "core/Color.h"
+#include "voxedit-util/SceneManager.h"
 #include "voxel/MaterialColor.h"
 #include "core/metric/Metric.h"
 #include "core/TimeProvider.h"
@@ -11,12 +12,12 @@
 #include "core/command/Command.h"
 #include "core/command/CommandCompleter.h"
 #include "video/Renderer.h"
-#include "ui/VoxEditWindow.h"
+#include "voxedit-ui/VoxEditWindow.h"
 #include "core/io/Filesystem.h"
 #include "voxedit-util/CustomBindingContext.h"
 
 VoxEdit::VoxEdit(const metric::MetricPtr& metric, const io::FilesystemPtr& filesystem, const core::EventBusPtr& eventBus, const core::TimeProviderPtr& timeProvider) :
-		Super(metric, filesystem, eventBus, timeProvider), _mainWindow(nullptr), _sceneMgr(voxedit::sceneMgr()) {
+		Super(metric, filesystem, eventBus, timeProvider) {
 	init(ORGANISATION, "voxedit");
 	_allowRelativeMouseMode = false;
 }
@@ -78,7 +79,7 @@ bool VoxEdit::newFile(bool force) {
 }
 
 core::AppState VoxEdit::onCleanup() {
-	_sceneMgr.shutdown();
+	voxedit::sceneMgr().shutdown();
 	return Super::onCleanup();
 }
 
@@ -87,11 +88,11 @@ void VoxEdit::onDropFile(const core::String& file) {
 		return;
 	}
 	if (_mainWindow->isPaletteWidgetDropTarget()) {
-		if (_sceneMgr.importPalette(file)) {
+		if (voxedit::sceneMgr().importPalette(file)) {
 			return;
 		}
 	}
-	if (_sceneMgr.prefab(file)) {
+	if (voxedit::sceneMgr().prefab(file)) {
 		return;
 	}
 	Log::warn("Failed to handle %s as drop file event", file.c_str());
@@ -102,7 +103,7 @@ core::AppState VoxEdit::onConstruct() {
 
 	_framesPerSecondsCap->setVal(60.0f);
 
-	_sceneMgr.construct();
+	voxedit::sceneMgr().construct();
 
 #define COMMAND_FILE(command, help) \
 	core::Command::registerCommand(#command, [this] (const core::CmdArgs& args) { \
@@ -165,7 +166,7 @@ core::AppState VoxEdit::onInit() {
 		return state;
 	}
 
-	if (!_sceneMgr.init()) {
+	if (!voxedit::sceneMgr().init()) {
 		Log::error("Failed to initialize the scene manager");
 		return core::AppState::InitFailure;
 	}
@@ -192,7 +193,7 @@ core::AppState VoxEdit::onInit() {
 		const char *file = _argv[_argc - 1];
 		const io::FilePtr& filePtr = filesystem()->open(file);
 		if (filePtr->exists()) {
-			_sceneMgr.load(filePtr->name());
+			voxedit::sceneMgr().load(filePtr->name());
 		}
 	}
 
diff --git a/src/tools/voxedit/VoxEdit.h b/src/tools/voxedit/VoxEdit.h
index 8f06db149..1a6359baa 100644
--- a/src/tools/voxedit/VoxEdit.h
+++ b/src/tools/voxedit/VoxEdit.h
@@ -5,7 +5,7 @@
 #pragma once
 
 #include "ui/turbobadger/UIApp.h"
-#include "ui/VoxEditWindow.h"
+#include "voxedit-ui/VoxEditWindow.h"
 #include "voxedit-util/SceneManager.h"
 #include "core/ArrayLength.h"
 
@@ -17,8 +17,7 @@
 class VoxEdit: public ui::turbobadger::UIApp {
 private:
 	using Super = ui::turbobadger::UIApp;
-	voxedit::VoxEditWindow* _mainWindow;
-	voxedit::SceneManager& _sceneMgr;
+	voxedit::VoxEditWindow* _mainWindow = nullptr;
 
 public:
 	VoxEdit(const metric::MetricPtr& metric, const io::FilesystemPtr& filesystem, const core::EventBusPtr& eventBus, const core::TimeProviderPtr& timeProvider);
diff --git a/src/tools/voxedit/modules/CMakeLists.txt b/src/tools/voxedit/modules/CMakeLists.txt
new file mode 100644
index 000000000..877852f30
--- /dev/null
+++ b/src/tools/voxedit/modules/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_subdirectory(voxedit-util)
+add_subdirectory(voxedit-ui)
diff --git a/src/tools/voxedit/modules/voxedit-ui/CMakeLists.txt b/src/tools/voxedit/modules/voxedit-ui/CMakeLists.txt
new file mode 100644
index 000000000..0a157b65b
--- /dev/null
+++ b/src/tools/voxedit/modules/voxedit-ui/CMakeLists.txt
@@ -0,0 +1,92 @@
+set(LIB voxedit-ui)
+
+set(SRCS
+	editorscene/Viewport.h editorscene/Viewport.cpp
+
+	palette/PaletteWidget.h palette/PaletteWidget.cpp
+	palette/PaletteSelector.h palette/PaletteSelector.cpp
+
+	settings/SceneSettingsWindow.h settings/SceneSettingsWindow.cpp
+
+	layer/AbstractLayerPopupWindow.h layer/AbstractLayerPopupWindow.cpp
+	layer/LayerWidget.h layer/LayerWidget.cpp
+	layer/LayerWindow.h layer/LayerWindow.cpp
+	layer/LayerMoveWindow.h
+	layer/LayerRenameWindow.h
+
+	VoxEditWindow.h VoxEditWindow.cpp
+)
+
+set(UI_WINDOWS
+	voxedit-ui/ui/window/voxedit-layer-rename.tb.txt
+	voxedit-ui/ui/window/voxedit-layer-move.tb.txt
+	voxedit-ui/ui/window/voxedit-layer.tb.txt
+	voxedit-ui/ui/window/voxedit-main.tb.txt
+	voxedit-ui/ui/window/voxedit-palette-selector.tb.txt
+	voxedit-ui/ui/window/voxedit-scene-settings.tb.txt
+)
+
+set(IMAGES
+	voxedit-ui/ui/skin/voxedit-add
+	voxedit-ui/ui/skin/voxedit-anim-play
+	voxedit-ui/ui/skin/voxedit-anim-play-selected
+	voxedit-ui/ui/skin/voxedit-animation
+	voxedit-ui/ui/skin/voxedit-animation-selected
+	voxedit-ui/ui/skin/voxedit-axis-x
+	voxedit-ui/ui/skin/voxedit-axis-y
+	voxedit-ui/ui/skin/voxedit-axis-z
+	voxedit-ui/ui/skin/voxedit-color-picker
+	voxedit-ui/ui/skin/voxedit-color
+	voxedit-ui/ui/skin/voxedit-colors
+	voxedit-ui/ui/skin/voxedit-crop
+	voxedit-ui/ui/skin/voxedit-delete
+	voxedit-ui/ui/skin/voxedit-export
+	voxedit-ui/ui/skin/voxedit-extend
+	voxedit-ui/ui/skin/voxedit-flip-horizontal
+	voxedit-ui/ui/skin/voxedit-flip-vertical
+	voxedit-ui/ui/skin/voxedit-import-palette
+	voxedit-ui/ui/skin/voxedit-load
+	voxedit-ui/ui/skin/voxedit-lock-layer
+	voxedit-ui/ui/skin/voxedit-lock-layer-selected
+	voxedit-ui/ui/skin/voxedit-move
+	voxedit-ui/ui/skin/voxedit-new
+	voxedit-ui/ui/skin/voxedit-options
+	voxedit-ui/ui/skin/voxedit-override
+	voxedit-ui/ui/skin/voxedit-quadview
+	voxedit-ui/ui/skin/voxedit-quadview-selected
+	voxedit-ui/ui/skin/voxedit-quit
+	voxedit-ui/ui/skin/voxedit-undo-redo
+	voxedit-ui/ui/skin/voxedit-reset-camera
+	voxedit-ui/ui/skin/voxedit-rotate
+	voxedit-ui/ui/skin/voxedit-save
+	voxedit-ui/ui/skin/voxedit-shift
+	voxedit-ui/ui/skin/voxedit-show-grid
+	voxedit-ui/ui/skin/voxedit-show-grid-selected
+	voxedit-ui/ui/skin/voxedit-tree_pine
+	voxedit-ui/ui/skin/voxedit-tree
+	voxedit-ui/ui/skin/voxedit-up
+	voxedit-ui/ui/skin/voxedit-visible
+	voxedit-ui/ui/skin/voxedit-visible-selected
+	voxedit-ui/ui/skin/voxedit-voxel
+)
+
+set(FILES
+	${UI_WINDOWS}
+	voxedit-ui/ui/skin/voxedit-skin.tb.txt
+	voxedit-ui/ui/widget/voxedit-layer-item.tb.txt
+	voxedit-ui/ui/widget/voxedit-layer.tb.txt
+	voxedit-ui/ui/lang/en.tb.txt
+)
+
+foreach(IMAGE ${IMAGES})
+	list(APPEND FILES ${IMAGE}.png)
+endforeach()
+set(DPIS "@288")
+foreach(DPI ${DPIS})
+	foreach(IMAGE ${IMAGES})
+		list(APPEND FILES ${IMAGE}${DPI}.png)
+	endforeach()
+endforeach()
+
+engine_add_module(TARGET ${LIB} SRCS ${SRCS} FILES ${FILES} DEPENDENCIES turbobadger voxedit-util)
+check_ui_turbobadger(${LIB} ${UI_WINDOWS})
diff --git a/src/tools/voxedit/ui/VoxEditWindow.cpp b/src/tools/voxedit/modules/voxedit-ui/VoxEditWindow.cpp
similarity index 99%
rename from src/tools/voxedit/ui/VoxEditWindow.cpp
rename to src/tools/voxedit/modules/voxedit-ui/VoxEditWindow.cpp
index ba6cdecf5..b4af6f135 100644
--- a/src/tools/voxedit/ui/VoxEditWindow.cpp
+++ b/src/tools/voxedit/modules/voxedit-ui/VoxEditWindow.cpp
@@ -16,8 +16,10 @@
 #include "voxedit-util/Config.h"
 #include "voxedit-util/SceneManager.h"
 #include "voxelformat/Loader.h"
+#include "ui/turbobadger/UIApp.h"
 
-#include "../VoxEdit.h"
+static PaletteWidgetFactory paletteWidget_wf;
+static LayerWidgetFactory layerWidget_wf;
 
 namespace voxedit {
 
@@ -41,7 +43,7 @@ static const struct {
 };
 static_assert(lengthof(treeTypes) == (int)voxelgenerator::TreeType::Max, "Missing support for tree types in the ui");
 
-VoxEditWindow::VoxEditWindow(VoxEdit* tool) :
+VoxEditWindow::VoxEditWindow(ui::turbobadger::UIApp* tool) :
 		Super(tool) {
 	setSettings(tb::WINDOW_SETTINGS_CAN_ACTIVATE);
 	for (int i = 0; i < lengthof(treeTypes); ++i) {
diff --git a/src/tools/voxedit/ui/VoxEditWindow.h b/src/tools/voxedit/modules/voxedit-ui/VoxEditWindow.h
similarity index 97%
rename from src/tools/voxedit/ui/VoxEditWindow.h
rename to src/tools/voxedit/modules/voxedit-ui/VoxEditWindow.h
index 335463026..ac8bb4e3f 100644
--- a/src/tools/voxedit/ui/VoxEditWindow.h
+++ b/src/tools/voxedit/modules/voxedit-ui/VoxEditWindow.h
@@ -15,17 +15,21 @@
 #include "voxelgenerator/TreeContext.h"
 
 class Viewport;
-class VoxEdit;
 class PaletteWidget;
 class LayerWidget;
 
+namespace ui {
+namespace turbobadger {
+class UIApp;
+}
+}
+
 namespace voxedit {
 
 /**
  * @brief Voxel editing tools panel
  */
 class VoxEditWindow: public ui::turbobadger::Window {
-	friend class ::VoxEdit;
 private:
 	using Super = ui::turbobadger::Window;
 	Viewport* _scene = nullptr;
@@ -130,12 +134,15 @@ private:
 
 	bool handleClickEvent(const tb::TBWidgetEvent &ev);
 	bool handleChangeEvent(const tb::TBWidgetEvent &ev);
-	void resetCamera();
 	void quit();
 
 	void updateStatusBar();
 
 	void afterLoad(const core::String& file);
+public:
+	VoxEditWindow(ui::turbobadger::UIApp* tool);
+	~VoxEditWindow();
+	bool init();
 
 	// commands
 	void toggleViewport();
@@ -149,10 +156,7 @@ private:
 	bool saveScreenshot(const core::String& file);
 	bool prefab(const core::String& file);
 	bool createNew(bool force);
-public:
-	VoxEditWindow(VoxEdit* tool);
-	~VoxEditWindow();
-	bool init();
+	void resetCamera();
 
 	bool isLayerWidgetDropTarget() const;
 	bool isPaletteWidgetDropTarget() const;
diff --git a/src/tools/voxedit/ui/editorscene/Viewport.cpp b/src/tools/voxedit/modules/voxedit-ui/editorscene/Viewport.cpp
similarity index 100%
rename from src/tools/voxedit/ui/editorscene/Viewport.cpp
rename to src/tools/voxedit/modules/voxedit-ui/editorscene/Viewport.cpp
diff --git a/src/tools/voxedit/ui/editorscene/Viewport.h b/src/tools/voxedit/modules/voxedit-ui/editorscene/Viewport.h
similarity index 100%
rename from src/tools/voxedit/ui/editorscene/Viewport.h
rename to src/tools/voxedit/modules/voxedit-ui/editorscene/Viewport.h
diff --git a/src/tools/voxedit/ui/layer/AbstractLayerPopupWindow.cpp b/src/tools/voxedit/modules/voxedit-ui/layer/AbstractLayerPopupWindow.cpp
similarity index 100%
rename from src/tools/voxedit/ui/layer/AbstractLayerPopupWindow.cpp
rename to src/tools/voxedit/modules/voxedit-ui/layer/AbstractLayerPopupWindow.cpp
diff --git a/src/tools/voxedit/ui/layer/AbstractLayerPopupWindow.h b/src/tools/voxedit/modules/voxedit-ui/layer/AbstractLayerPopupWindow.h
similarity index 100%
rename from src/tools/voxedit/ui/layer/AbstractLayerPopupWindow.h
rename to src/tools/voxedit/modules/voxedit-ui/layer/AbstractLayerPopupWindow.h
diff --git a/src/tools/voxedit/ui/layer/LayerMoveWindow.h b/src/tools/voxedit/modules/voxedit-ui/layer/LayerMoveWindow.h
similarity index 100%
rename from src/tools/voxedit/ui/layer/LayerMoveWindow.h
rename to src/tools/voxedit/modules/voxedit-ui/layer/LayerMoveWindow.h
diff --git a/src/tools/voxedit/ui/layer/LayerRenameWindow.h b/src/tools/voxedit/modules/voxedit-ui/layer/LayerRenameWindow.h
similarity index 100%
rename from src/tools/voxedit/ui/layer/LayerRenameWindow.h
rename to src/tools/voxedit/modules/voxedit-ui/layer/LayerRenameWindow.h
diff --git a/src/tools/voxedit/ui/layer/LayerWidget.cpp b/src/tools/voxedit/modules/voxedit-ui/layer/LayerWidget.cpp
similarity index 99%
rename from src/tools/voxedit/ui/layer/LayerWidget.cpp
rename to src/tools/voxedit/modules/voxedit-ui/layer/LayerWidget.cpp
index 2670e81a7..4bf5a72ee 100644
--- a/src/tools/voxedit/ui/layer/LayerWidget.cpp
+++ b/src/tools/voxedit/modules/voxedit-ui/layer/LayerWidget.cpp
@@ -370,5 +370,3 @@ bool LayerWidget::onEvent(const tb::TBWidgetEvent &ev) {
 	}
 	return Super::onEvent(ev);
 }
-
-static LayerWidgetFactory layerWidget_wf;
diff --git a/src/tools/voxedit/ui/layer/LayerWidget.h b/src/tools/voxedit/modules/voxedit-ui/layer/LayerWidget.h
similarity index 100%
rename from src/tools/voxedit/ui/layer/LayerWidget.h
rename to src/tools/voxedit/modules/voxedit-ui/layer/LayerWidget.h
diff --git a/src/tools/voxedit/ui/layer/LayerWindow.cpp b/src/tools/voxedit/modules/voxedit-ui/layer/LayerWindow.cpp
similarity index 100%
rename from src/tools/voxedit/ui/layer/LayerWindow.cpp
rename to src/tools/voxedit/modules/voxedit-ui/layer/LayerWindow.cpp
diff --git a/src/tools/voxedit/ui/layer/LayerWindow.h b/src/tools/voxedit/modules/voxedit-ui/layer/LayerWindow.h
similarity index 100%
rename from src/tools/voxedit/ui/layer/LayerWindow.h
rename to src/tools/voxedit/modules/voxedit-ui/layer/LayerWindow.h
diff --git a/src/tools/voxedit/ui/palette/PaletteSelector.cpp b/src/tools/voxedit/modules/voxedit-ui/palette/PaletteSelector.cpp
similarity index 100%
rename from src/tools/voxedit/ui/palette/PaletteSelector.cpp
rename to src/tools/voxedit/modules/voxedit-ui/palette/PaletteSelector.cpp
diff --git a/src/tools/voxedit/ui/palette/PaletteSelector.h b/src/tools/voxedit/modules/voxedit-ui/palette/PaletteSelector.h
similarity index 100%
rename from src/tools/voxedit/ui/palette/PaletteSelector.h
rename to src/tools/voxedit/modules/voxedit-ui/palette/PaletteSelector.h
diff --git a/src/tools/voxedit/ui/palette/PaletteWidget.cpp b/src/tools/voxedit/modules/voxedit-ui/palette/PaletteWidget.cpp
similarity index 98%
rename from src/tools/voxedit/ui/palette/PaletteWidget.cpp
rename to src/tools/voxedit/modules/voxedit-ui/palette/PaletteWidget.cpp
index 53d3d8d51..bac4af5be 100644
--- a/src/tools/voxedit/ui/palette/PaletteWidget.cpp
+++ b/src/tools/voxedit/modules/voxedit-ui/palette/PaletteWidget.cpp
@@ -97,5 +97,3 @@ void PaletteWidget::onInflate(const tb::INFLATE_INFO &info) {
 	_amountX = info.node->getValueInt("amount-x", 8);
 	Super::onInflate(info);
 }
-
-static PaletteWidgetFactory paletteWidget_wf;
diff --git a/src/tools/voxedit/ui/palette/PaletteWidget.h b/src/tools/voxedit/modules/voxedit-ui/palette/PaletteWidget.h
similarity index 100%
rename from src/tools/voxedit/ui/palette/PaletteWidget.h
rename to src/tools/voxedit/modules/voxedit-ui/palette/PaletteWidget.h
diff --git a/src/tools/voxedit/ui/settings/SceneSettingsWindow.cpp b/src/tools/voxedit/modules/voxedit-ui/settings/SceneSettingsWindow.cpp
similarity index 100%
rename from src/tools/voxedit/ui/settings/SceneSettingsWindow.cpp
rename to src/tools/voxedit/modules/voxedit-ui/settings/SceneSettingsWindow.cpp
diff --git a/src/tools/voxedit/ui/settings/SceneSettingsWindow.h b/src/tools/voxedit/modules/voxedit-ui/settings/SceneSettingsWindow.h
similarity index 100%
rename from src/tools/voxedit/ui/settings/SceneSettingsWindow.h
rename to src/tools/voxedit/modules/voxedit-ui/settings/SceneSettingsWindow.h
diff --git a/src/tools/voxedit/voxedit-util/AxisUtil.cpp b/src/tools/voxedit/modules/voxedit-util/AxisUtil.cpp
similarity index 100%
rename from src/tools/voxedit/voxedit-util/AxisUtil.cpp
rename to src/tools/voxedit/modules/voxedit-util/AxisUtil.cpp
diff --git a/src/tools/voxedit/voxedit-util/AxisUtil.h b/src/tools/voxedit/modules/voxedit-util/AxisUtil.h
similarity index 100%
rename from src/tools/voxedit/voxedit-util/AxisUtil.h
rename to src/tools/voxedit/modules/voxedit-util/AxisUtil.h
diff --git a/src/tools/voxedit/voxedit-util/CMakeLists.txt b/src/tools/voxedit/modules/voxedit-util/CMakeLists.txt
similarity index 92%
rename from src/tools/voxedit/voxedit-util/CMakeLists.txt
rename to src/tools/voxedit/modules/voxedit-util/CMakeLists.txt
index 497b28fe2..941d45a4c 100644
--- a/src/tools/voxedit/voxedit-util/CMakeLists.txt
+++ b/src/tools/voxedit/modules/voxedit-util/CMakeLists.txt
@@ -43,7 +43,7 @@ gtest_suite_deps(tests ${LIB})
 gtest_suite_files(tests ${TEST_FILES})
 
 gtest_suite_begin(tests-${LIB} TEMPLATE ${ROOT_DIR}/src/modules/core/tests/main.cpp.in)
-gtest_suite_sources(tests-${LIB} ${TEST_SRCS} ../../../modules/core/tests/AbstractTest.cpp)
+gtest_suite_sources(tests-${LIB} ${TEST_SRCS} ../../../../modules/core/tests/AbstractTest.cpp)
 gtest_suite_files(tests-${LIB} ${TEST_FILES})
 gtest_suite_deps(tests-${LIB} ${LIB})
 gtest_suite_end(tests-${LIB})
diff --git a/src/tools/voxedit/voxedit-util/Config.h b/src/tools/voxedit/modules/voxedit-util/Config.h
similarity index 100%
rename from src/tools/voxedit/voxedit-util/Config.h
rename to src/tools/voxedit/modules/voxedit-util/Config.h
diff --git a/src/tools/voxedit/voxedit-util/CustomBindingContext.h b/src/tools/voxedit/modules/voxedit-util/CustomBindingContext.h
similarity index 100%
rename from src/tools/voxedit/voxedit-util/CustomBindingContext.h
rename to src/tools/voxedit/modules/voxedit-util/CustomBindingContext.h
diff --git a/src/tools/voxedit/voxedit-util/MementoHandler.cpp b/src/tools/voxedit/modules/voxedit-util/MementoHandler.cpp
similarity index 100%
rename from src/tools/voxedit/voxedit-util/MementoHandler.cpp
rename to src/tools/voxedit/modules/voxedit-util/MementoHandler.cpp
diff --git a/src/tools/voxedit/voxedit-util/MementoHandler.h b/src/tools/voxedit/modules/voxedit-util/MementoHandler.h
similarity index 100%
rename from src/tools/voxedit/voxedit-util/MementoHandler.h
rename to src/tools/voxedit/modules/voxedit-util/MementoHandler.h
diff --git a/src/tools/voxedit/voxedit-util/SceneManager.cpp b/src/tools/voxedit/modules/voxedit-util/SceneManager.cpp
similarity index 100%
rename from src/tools/voxedit/voxedit-util/SceneManager.cpp
rename to src/tools/voxedit/modules/voxedit-util/SceneManager.cpp
diff --git a/src/tools/voxedit/voxedit-util/SceneManager.h b/src/tools/voxedit/modules/voxedit-util/SceneManager.h
similarity index 100%
rename from src/tools/voxedit/voxedit-util/SceneManager.h
rename to src/tools/voxedit/modules/voxedit-util/SceneManager.h
diff --git a/src/tools/voxedit/voxedit-util/ViewportController.cpp b/src/tools/voxedit/modules/voxedit-util/ViewportController.cpp
similarity index 100%
rename from src/tools/voxedit/voxedit-util/ViewportController.cpp
rename to src/tools/voxedit/modules/voxedit-util/ViewportController.cpp
diff --git a/src/tools/voxedit/voxedit-util/ViewportController.h b/src/tools/voxedit/modules/voxedit-util/ViewportController.h
similarity index 100%
rename from src/tools/voxedit/voxedit-util/ViewportController.h
rename to src/tools/voxedit/modules/voxedit-util/ViewportController.h
diff --git a/src/tools/voxedit/voxedit-util/anim/AnimationLuaSaver.cpp b/src/tools/voxedit/modules/voxedit-util/anim/AnimationLuaSaver.cpp
similarity index 100%
rename from src/tools/voxedit/voxedit-util/anim/AnimationLuaSaver.cpp
rename to src/tools/voxedit/modules/voxedit-util/anim/AnimationLuaSaver.cpp
diff --git a/src/tools/voxedit/voxedit-util/anim/AnimationLuaSaver.h b/src/tools/voxedit/modules/voxedit-util/anim/AnimationLuaSaver.h
similarity index 100%
rename from src/tools/voxedit/voxedit-util/anim/AnimationLuaSaver.h
rename to src/tools/voxedit/modules/voxedit-util/anim/AnimationLuaSaver.h
diff --git a/src/tools/voxedit/voxedit-util/anim/VolumeCache.cpp b/src/tools/voxedit/modules/voxedit-util/anim/VolumeCache.cpp
similarity index 100%
rename from src/tools/voxedit/voxedit-util/anim/VolumeCache.cpp
rename to src/tools/voxedit/modules/voxedit-util/anim/VolumeCache.cpp
diff --git a/src/tools/voxedit/voxedit-util/anim/VolumeCache.h b/src/tools/voxedit/modules/voxedit-util/anim/VolumeCache.h
similarity index 100%
rename from src/tools/voxedit/voxedit-util/anim/VolumeCache.h
rename to src/tools/voxedit/modules/voxedit-util/anim/VolumeCache.h
diff --git a/src/tools/voxedit/voxedit-util/layer/Layer.h b/src/tools/voxedit/modules/voxedit-util/layer/Layer.h
similarity index 100%
rename from src/tools/voxedit/voxedit-util/layer/Layer.h
rename to src/tools/voxedit/modules/voxedit-util/layer/Layer.h
diff --git a/src/tools/voxedit/voxedit-util/layer/LayerListener.h b/src/tools/voxedit/modules/voxedit-util/layer/LayerListener.h
similarity index 100%
rename from src/tools/voxedit/voxedit-util/layer/LayerListener.h
rename to src/tools/voxedit/modules/voxedit-util/layer/LayerListener.h
diff --git a/src/tools/voxedit/voxedit-util/layer/LayerManager.cpp b/src/tools/voxedit/modules/voxedit-util/layer/LayerManager.cpp
similarity index 100%
rename from src/tools/voxedit/voxedit-util/layer/LayerManager.cpp
rename to src/tools/voxedit/modules/voxedit-util/layer/LayerManager.cpp
diff --git a/src/tools/voxedit/voxedit-util/layer/LayerManager.h b/src/tools/voxedit/modules/voxedit-util/layer/LayerManager.h
similarity index 100%
rename from src/tools/voxedit/voxedit-util/layer/LayerManager.h
rename to src/tools/voxedit/modules/voxedit-util/layer/LayerManager.h
diff --git a/src/tools/voxedit/voxedit-util/modifier/Modifier.cpp b/src/tools/voxedit/modules/voxedit-util/modifier/Modifier.cpp
similarity index 100%
rename from src/tools/voxedit/voxedit-util/modifier/Modifier.cpp
rename to src/tools/voxedit/modules/voxedit-util/modifier/Modifier.cpp
diff --git a/src/tools/voxedit/voxedit-util/modifier/Modifier.h b/src/tools/voxedit/modules/voxedit-util/modifier/Modifier.h
similarity index 100%
rename from src/tools/voxedit/voxedit-util/modifier/Modifier.h
rename to src/tools/voxedit/modules/voxedit-util/modifier/Modifier.h
diff --git a/src/tools/voxedit/voxedit-util/modifier/ModifierButton.cpp b/src/tools/voxedit/modules/voxedit-util/modifier/ModifierButton.cpp
similarity index 100%
rename from src/tools/voxedit/voxedit-util/modifier/ModifierButton.cpp
rename to src/tools/voxedit/modules/voxedit-util/modifier/ModifierButton.cpp
diff --git a/src/tools/voxedit/voxedit-util/modifier/ModifierButton.h b/src/tools/voxedit/modules/voxedit-util/modifier/ModifierButton.h
similarity index 100%
rename from src/tools/voxedit/voxedit-util/modifier/ModifierButton.h
rename to src/tools/voxedit/modules/voxedit-util/modifier/ModifierButton.h
diff --git a/src/tools/voxedit/voxedit-util/modifier/ModifierType.h b/src/tools/voxedit/modules/voxedit-util/modifier/ModifierType.h
similarity index 100%
rename from src/tools/voxedit/voxedit-util/modifier/ModifierType.h
rename to src/tools/voxedit/modules/voxedit-util/modifier/ModifierType.h
diff --git a/src/tools/voxedit/voxedit-util/modifier/ModifierVolumeWrapper.h b/src/tools/voxedit/modules/voxedit-util/modifier/ModifierVolumeWrapper.h
similarity index 100%
rename from src/tools/voxedit/voxedit-util/modifier/ModifierVolumeWrapper.h
rename to src/tools/voxedit/modules/voxedit-util/modifier/ModifierVolumeWrapper.h
diff --git a/src/tools/voxedit/voxedit-util/modifier/Selection.h b/src/tools/voxedit/modules/voxedit-util/modifier/Selection.h
similarity index 100%
rename from src/tools/voxedit/voxedit-util/modifier/Selection.h
rename to src/tools/voxedit/modules/voxedit-util/modifier/Selection.h
diff --git a/src/tools/voxedit/voxedit-util/tests/AnimationLuaSaverTest.cpp b/src/tools/voxedit/modules/voxedit-util/tests/AnimationLuaSaverTest.cpp
similarity index 100%
rename from src/tools/voxedit/voxedit-util/tests/AnimationLuaSaverTest.cpp
rename to src/tools/voxedit/modules/voxedit-util/tests/AnimationLuaSaverTest.cpp
diff --git a/src/tools/voxedit/voxedit-util/tests/ImageUtilsTest.cpp b/src/tools/voxedit/modules/voxedit-util/tests/ImageUtilsTest.cpp
similarity index 100%
rename from src/tools/voxedit/voxedit-util/tests/ImageUtilsTest.cpp
rename to src/tools/voxedit/modules/voxedit-util/tests/ImageUtilsTest.cpp
diff --git a/src/tools/voxedit/voxedit-util/tests/LayerManagerTest.cpp b/src/tools/voxedit/modules/voxedit-util/tests/LayerManagerTest.cpp
similarity index 100%
rename from src/tools/voxedit/voxedit-util/tests/LayerManagerTest.cpp
rename to src/tools/voxedit/modules/voxedit-util/tests/LayerManagerTest.cpp
diff --git a/src/tools/voxedit/voxedit-util/tests/MementoHandlerTest.cpp b/src/tools/voxedit/modules/voxedit-util/tests/MementoHandlerTest.cpp
similarity index 100%
rename from src/tools/voxedit/voxedit-util/tests/MementoHandlerTest.cpp
rename to src/tools/voxedit/modules/voxedit-util/tests/MementoHandlerTest.cpp
diff --git a/src/tools/voxedit/voxedit-util/tests/ModifierTest.cpp b/src/tools/voxedit/modules/voxedit-util/tests/ModifierTest.cpp
similarity index 100%
rename from src/tools/voxedit/voxedit-util/tests/ModifierTest.cpp
rename to src/tools/voxedit/modules/voxedit-util/tests/ModifierTest.cpp
diff --git a/src/tools/voxedit/voxedit-util/tool/Clipboard.cpp b/src/tools/voxedit/modules/voxedit-util/tool/Clipboard.cpp
similarity index 100%
rename from src/tools/voxedit/voxedit-util/tool/Clipboard.cpp
rename to src/tools/voxedit/modules/voxedit-util/tool/Clipboard.cpp
diff --git a/src/tools/voxedit/voxedit-util/tool/Clipboard.h b/src/tools/voxedit/modules/voxedit-util/tool/Clipboard.h
similarity index 100%
rename from src/tools/voxedit/voxedit-util/tool/Clipboard.h
rename to src/tools/voxedit/modules/voxedit-util/tool/Clipboard.h
diff --git a/src/tools/voxedit/voxedit-util/tool/ImageUtils.cpp b/src/tools/voxedit/modules/voxedit-util/tool/ImageUtils.cpp
similarity index 100%
rename from src/tools/voxedit/voxedit-util/tool/ImageUtils.cpp
rename to src/tools/voxedit/modules/voxedit-util/tool/ImageUtils.cpp
diff --git a/src/tools/voxedit/voxedit-util/tool/ImageUtils.h b/src/tools/voxedit/modules/voxedit-util/tool/ImageUtils.h
similarity index 100%
rename from src/tools/voxedit/voxedit-util/tool/ImageUtils.h
rename to src/tools/voxedit/modules/voxedit-util/tool/ImageUtils.h
diff --git a/src/tools/voxedit/voxedit-util/tool/Resize.cpp b/src/tools/voxedit/modules/voxedit-util/tool/Resize.cpp
similarity index 100%
rename from src/tools/voxedit/voxedit-util/tool/Resize.cpp
rename to src/tools/voxedit/modules/voxedit-util/tool/Resize.cpp
diff --git a/src/tools/voxedit/voxedit-util/tool/Resize.h b/src/tools/voxedit/modules/voxedit-util/tool/Resize.h
similarity index 100%
rename from src/tools/voxedit/voxedit-util/tool/Resize.h
rename to src/tools/voxedit/modules/voxedit-util/tool/Resize.h