diff --git a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/App.kt b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/App.kt
index 754271ca..223668fa 100755
--- a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/App.kt
+++ b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/App.kt
@@ -1,6 +1,6 @@
 package com.bartlomiejpluta.base.editor
 
-import com.bartlomiejpluta.base.editor.view.main.MainView
+import com.bartlomiejpluta.base.editor.main.view.MainView
 import org.springframework.boot.SpringApplication
 import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.context.ConfigurableApplicationContext
diff --git a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/command/model/map/CreateLayerCommand.kt b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/command/model/map/CreateLayerCommand.kt
index 545bf597..54bd24f9 100755
--- a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/command/model/map/CreateLayerCommand.kt
+++ b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/command/model/map/CreateLayerCommand.kt
@@ -2,8 +2,8 @@ package com.bartlomiejpluta.base.editor.command.model.map
 
 import com.bartlomiejpluta.base.editor.command.model.base.Command
 import com.bartlomiejpluta.base.editor.command.model.base.Undoable
-import com.bartlomiejpluta.base.editor.model.map.layer.Layer
-import com.bartlomiejpluta.base.editor.model.map.map.GameMap
+import com.bartlomiejpluta.base.editor.map.model.layer.Layer
+import com.bartlomiejpluta.base.editor.map.model.map.GameMap
 
 class CreateLayerCommand(private val map: GameMap, private val layer: Layer): Undoable, Command {
 
diff --git a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/command/model/map/MoveLayerCommand.kt b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/command/model/map/MoveLayerCommand.kt
index c7c63acf..4aa4b807 100755
--- a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/command/model/map/MoveLayerCommand.kt
+++ b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/command/model/map/MoveLayerCommand.kt
@@ -2,7 +2,7 @@ package com.bartlomiejpluta.base.editor.command.model.map
 
 import com.bartlomiejpluta.base.editor.command.model.base.Command
 import com.bartlomiejpluta.base.editor.command.model.base.Undoable
-import com.bartlomiejpluta.base.editor.model.map.map.GameMap
+import com.bartlomiejpluta.base.editor.map.model.map.GameMap
 import tornadofx.swap
 
 class MoveLayerCommand(private val map: GameMap, private val currentIndex: Int, private val newIndex: Int) : Undoable, Command {
diff --git a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/command/model/map/RemoveLayerCommand.kt b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/command/model/map/RemoveLayerCommand.kt
index bb499e9f..846576a5 100755
--- a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/command/model/map/RemoveLayerCommand.kt
+++ b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/command/model/map/RemoveLayerCommand.kt
@@ -2,9 +2,8 @@ package com.bartlomiejpluta.base.editor.command.model.map
 
 import com.bartlomiejpluta.base.editor.command.model.base.Command
 import com.bartlomiejpluta.base.editor.command.model.base.Undoable
-import com.bartlomiejpluta.base.editor.model.map.layer.Layer
-import com.bartlomiejpluta.base.editor.model.map.map.GameMap
-import kotlin.math.min
+import com.bartlomiejpluta.base.editor.map.model.layer.Layer
+import com.bartlomiejpluta.base.editor.map.model.map.GameMap
 
 class RemoveLayerCommand(private val map: GameMap, private val layerIndex: Int) : Undoable, Command {
    private var layer: Layer? = null
diff --git a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/command/model/map/RenameLayerCommand.kt b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/command/model/map/RenameLayerCommand.kt
index 8759701e..07340a0e 100755
--- a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/command/model/map/RenameLayerCommand.kt
+++ b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/command/model/map/RenameLayerCommand.kt
@@ -2,7 +2,7 @@ package com.bartlomiejpluta.base.editor.command.model.map
 
 import com.bartlomiejpluta.base.editor.command.model.base.Command
 import com.bartlomiejpluta.base.editor.command.model.base.Undoable
-import com.bartlomiejpluta.base.editor.model.map.layer.Layer
+import com.bartlomiejpluta.base.editor.map.model.layer.Layer
 
 class RenameLayerCommand(private val layer: Layer, private val newName: String) : Undoable, Command {
    private val formerName = layer.name
diff --git a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/controller/main/MainController.kt b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/main/controller/MainController.kt
similarity index 59%
rename from editor/src/main/kotlin/com/bartlomiejpluta/base/editor/controller/main/MainController.kt
rename to editor/src/main/kotlin/com/bartlomiejpluta/base/editor/main/controller/MainController.kt
index 6b52ab34..54c35678 100755
--- a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/controller/main/MainController.kt
+++ b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/main/controller/MainController.kt
@@ -1,16 +1,14 @@
-package com.bartlomiejpluta.base.editor.controller.main
+package com.bartlomiejpluta.base.editor.main.controller
 
 import com.bartlomiejpluta.base.editor.command.context.UndoableScope
-import com.bartlomiejpluta.base.editor.model.map.map.GameMap
-import com.bartlomiejpluta.base.editor.model.tileset.TileSet
-import com.bartlomiejpluta.base.editor.view.map.MapSettingsFragment
-import com.bartlomiejpluta.base.editor.viewmodel.map.GameMapVM
+import com.bartlomiejpluta.base.editor.map.model.map.GameMap
+import com.bartlomiejpluta.base.editor.tileset.model.TileSet
+import com.bartlomiejpluta.base.editor.map.view.MapSettingsFragment
+import com.bartlomiejpluta.base.editor.map.viewmodel.GameMapVM
 import org.springframework.stereotype.Component
 import tornadofx.Controller
 import tornadofx.Scope
-import tornadofx.find
 import tornadofx.observableMapOf
-import kotlin.collections.set
 
 @Component
 class MainController : Controller() {
@@ -25,7 +23,7 @@ class MainController : Controller() {
       val vm = GameMapVM(map)
       setInScope(vm, scope)
 
-      val modal = find<MapSettingsFragment>(scope).apply { openModal(block = true, resizable = false) }
+      val modal = tornadofx.find<MapSettingsFragment>(scope).apply { openModal(block = true, resizable = false) }
 
       if (modal.result) {
          openMaps[scope] = map
diff --git a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/view/main/MainMenuView.kt b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/main/view/MainMenuView.kt
similarity index 68%
rename from editor/src/main/kotlin/com/bartlomiejpluta/base/editor/view/main/MainMenuView.kt
rename to editor/src/main/kotlin/com/bartlomiejpluta/base/editor/main/view/MainMenuView.kt
index ce6e2e7a..03f99dc5 100755
--- a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/view/main/MainMenuView.kt
+++ b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/main/view/MainMenuView.kt
@@ -1,7 +1,6 @@
-package com.bartlomiejpluta.base.editor.view.main
+package com.bartlomiejpluta.base.editor.main.view
 
-import com.bartlomiejpluta.base.editor.controller.main.MainController
-import com.bartlomiejpluta.base.editor.view.map.MapSettingsFragment
+import com.bartlomiejpluta.base.editor.main.controller.MainController
 import tornadofx.*
 
 class MainMenuView : View() {
diff --git a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/view/main/MainView.kt b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/main/view/MainView.kt
similarity index 75%
rename from editor/src/main/kotlin/com/bartlomiejpluta/base/editor/view/main/MainView.kt
rename to editor/src/main/kotlin/com/bartlomiejpluta/base/editor/main/view/MainView.kt
index 973447db..da9c3ed8 100755
--- a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/view/main/MainView.kt
+++ b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/main/view/MainView.kt
@@ -1,7 +1,7 @@
-package com.bartlomiejpluta.base.editor.view.main
+package com.bartlomiejpluta.base.editor.main.view
 
-import com.bartlomiejpluta.base.editor.controller.main.MainController
-import com.bartlomiejpluta.base.editor.view.map.MapFragment
+import com.bartlomiejpluta.base.editor.main.controller.MainController
+import com.bartlomiejpluta.base.editor.map.view.MapFragment
 import javafx.scene.control.Tab
 import tornadofx.*
 
diff --git a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/render/canvas/map/MapCanvas.kt b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/map/canvas/MapCanvas.kt
similarity index 87%
rename from editor/src/main/kotlin/com/bartlomiejpluta/base/editor/render/canvas/map/MapCanvas.kt
rename to editor/src/main/kotlin/com/bartlomiejpluta/base/editor/map/canvas/MapCanvas.kt
index 81d6f307..aa8b05e9 100755
--- a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/render/canvas/map/MapCanvas.kt
+++ b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/map/canvas/MapCanvas.kt
@@ -1,10 +1,10 @@
-package com.bartlomiejpluta.base.editor.render.canvas.map
+package com.bartlomiejpluta.base.editor.map.canvas
 
-import com.bartlomiejpluta.base.editor.model.map.layer.Layer
-import com.bartlomiejpluta.base.editor.model.map.layer.TileLayer
+import com.bartlomiejpluta.base.editor.map.model.layer.Layer
+import com.bartlomiejpluta.base.editor.map.model.layer.TileLayer
 import com.bartlomiejpluta.base.editor.render.model.Renderable
-import com.bartlomiejpluta.base.editor.viewmodel.map.EditorStateVM
-import com.bartlomiejpluta.base.editor.viewmodel.map.GameMapVM
+import com.bartlomiejpluta.base.editor.map.viewmodel.EditorStateVM
+import com.bartlomiejpluta.base.editor.map.viewmodel.GameMapVM
 import javafx.scene.canvas.GraphicsContext
 import javafx.scene.paint.Color
 
diff --git a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/render/canvas/map/MapPainter.kt b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/map/canvas/MapPainter.kt
similarity index 84%
rename from editor/src/main/kotlin/com/bartlomiejpluta/base/editor/render/canvas/map/MapPainter.kt
rename to editor/src/main/kotlin/com/bartlomiejpluta/base/editor/map/canvas/MapPainter.kt
index c344e923..de8d931d 100755
--- a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/render/canvas/map/MapPainter.kt
+++ b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/map/canvas/MapPainter.kt
@@ -1,12 +1,12 @@
-package com.bartlomiejpluta.base.editor.render.canvas.map
+package com.bartlomiejpluta.base.editor.map.canvas
 
-import com.bartlomiejpluta.base.editor.model.tileset.Tile
-import com.bartlomiejpluta.base.editor.render.canvas.input.MapMouseEvent
-import com.bartlomiejpluta.base.editor.render.canvas.input.MapMouseEventHandler
+import com.bartlomiejpluta.base.editor.tileset.model.Tile
+import com.bartlomiejpluta.base.editor.render.input.MapMouseEvent
+import com.bartlomiejpluta.base.editor.render.input.MapMouseEventHandler
 import com.bartlomiejpluta.base.editor.render.model.Renderable
-import com.bartlomiejpluta.base.editor.viewmodel.map.BrushVM
-import com.bartlomiejpluta.base.editor.viewmodel.map.EditorStateVM
-import com.bartlomiejpluta.base.editor.viewmodel.map.GameMapVM
+import com.bartlomiejpluta.base.editor.map.viewmodel.BrushVM
+import com.bartlomiejpluta.base.editor.map.viewmodel.EditorStateVM
+import com.bartlomiejpluta.base.editor.map.viewmodel.GameMapVM
 import javafx.scene.canvas.GraphicsContext
 import javafx.scene.input.MouseButton
 import javafx.scene.input.MouseEvent
diff --git a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/render/canvas/map/MapPaintingTrace.kt b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/map/canvas/MapPaintingTrace.kt
similarity index 83%
rename from editor/src/main/kotlin/com/bartlomiejpluta/base/editor/render/canvas/map/MapPaintingTrace.kt
rename to editor/src/main/kotlin/com/bartlomiejpluta/base/editor/map/canvas/MapPaintingTrace.kt
index 71578139..a2452ae8 100755
--- a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/render/canvas/map/MapPaintingTrace.kt
+++ b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/map/canvas/MapPaintingTrace.kt
@@ -1,9 +1,9 @@
-package com.bartlomiejpluta.base.editor.render.canvas.map
+package com.bartlomiejpluta.base.editor.map.canvas
 
 import com.bartlomiejpluta.base.editor.command.model.base.Undoable
-import com.bartlomiejpluta.base.editor.model.map.layer.TileLayer
-import com.bartlomiejpluta.base.editor.model.tileset.Tile
-import com.bartlomiejpluta.base.editor.viewmodel.map.GameMapVM
+import com.bartlomiejpluta.base.editor.map.model.layer.TileLayer
+import com.bartlomiejpluta.base.editor.tileset.model.Tile
+import com.bartlomiejpluta.base.editor.map.viewmodel.GameMapVM
 
 
 data class MapPaintingTrace(val map: GameMapVM, override val commandName: String) : Undoable {
diff --git a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/view/component/map/MapPane.kt b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/map/component/MapPane.kt
similarity index 69%
rename from editor/src/main/kotlin/com/bartlomiejpluta/base/editor/view/component/map/MapPane.kt
rename to editor/src/main/kotlin/com/bartlomiejpluta/base/editor/map/component/MapPane.kt
index 775661ba..9fee9d14 100755
--- a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/view/component/map/MapPane.kt
+++ b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/map/component/MapPane.kt
@@ -1,17 +1,16 @@
-package com.bartlomiejpluta.base.editor.view.component.map
+package com.bartlomiejpluta.base.editor.map.component
 
-import com.bartlomiejpluta.base.editor.render.canvas.input.MapMouseEvent
-import com.bartlomiejpluta.base.editor.render.canvas.map.MapCanvas
-import com.bartlomiejpluta.base.editor.render.canvas.map.MapPainter
-import com.bartlomiejpluta.base.editor.render.canvas.map.MapPaintingTrace
-import com.bartlomiejpluta.base.editor.viewmodel.map.BrushVM
-import com.bartlomiejpluta.base.editor.viewmodel.map.EditorStateVM
-import com.bartlomiejpluta.base.editor.viewmodel.map.GameMapVM
+import com.bartlomiejpluta.base.editor.map.canvas.MapCanvas
+import com.bartlomiejpluta.base.editor.map.canvas.MapPainter
+import com.bartlomiejpluta.base.editor.map.canvas.MapPaintingTrace
+import com.bartlomiejpluta.base.editor.render.input.MapMouseEvent
+import com.bartlomiejpluta.base.editor.map.viewmodel.BrushVM
+import com.bartlomiejpluta.base.editor.map.viewmodel.EditorStateVM
+import com.bartlomiejpluta.base.editor.map.viewmodel.GameMapVM
 import javafx.event.EventHandler
 import javafx.scene.canvas.Canvas
 import javafx.scene.input.MouseEvent
 
-
 class MapPane(
    private val mapVM: GameMapVM,
    brushVM: BrushVM,
diff --git a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/model/map/brush/Brush.kt b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/map/model/brush/Brush.kt
similarity index 92%
rename from editor/src/main/kotlin/com/bartlomiejpluta/base/editor/model/map/brush/Brush.kt
rename to editor/src/main/kotlin/com/bartlomiejpluta/base/editor/map/model/brush/Brush.kt
index f58dc9f0..c9f2fb80 100755
--- a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/model/map/brush/Brush.kt
+++ b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/map/model/brush/Brush.kt
@@ -1,6 +1,6 @@
-package com.bartlomiejpluta.base.editor.model.map.brush
+package com.bartlomiejpluta.base.editor.map.model.brush
 
-import com.bartlomiejpluta.base.editor.model.tileset.Tile
+import com.bartlomiejpluta.base.editor.tileset.model.Tile
 import javafx.beans.property.SimpleIntegerProperty
 import javafx.beans.property.SimpleObjectProperty
 import javafx.collections.ObservableList
diff --git a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/map/model/brush/BrushMode.kt b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/map/model/brush/BrushMode.kt
new file mode 100755
index 00000000..57b20257
--- /dev/null
+++ b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/map/model/brush/BrushMode.kt
@@ -0,0 +1,6 @@
+package com.bartlomiejpluta.base.editor.map.model.brush
+
+enum class BrushMode {
+   PAINTING_MODE,
+   ERASING_MODE
+}
\ No newline at end of file
diff --git a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/model/map/layer/Layer.kt b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/map/model/layer/Layer.kt
similarity index 71%
rename from editor/src/main/kotlin/com/bartlomiejpluta/base/editor/model/map/layer/Layer.kt
rename to editor/src/main/kotlin/com/bartlomiejpluta/base/editor/map/model/layer/Layer.kt
index 7037fc17..0eb1b5d7 100755
--- a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/model/map/layer/Layer.kt
+++ b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/map/model/layer/Layer.kt
@@ -1,4 +1,4 @@
-package com.bartlomiejpluta.base.editor.model.map.layer
+package com.bartlomiejpluta.base.editor.map.model.layer
 
 import javafx.beans.property.StringProperty
 
diff --git a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/model/map/layer/TileLayer.kt b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/map/model/layer/TileLayer.kt
similarity index 80%
rename from editor/src/main/kotlin/com/bartlomiejpluta/base/editor/model/map/layer/TileLayer.kt
rename to editor/src/main/kotlin/com/bartlomiejpluta/base/editor/map/model/layer/TileLayer.kt
index ddabbf04..b98740ab 100755
--- a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/model/map/layer/TileLayer.kt
+++ b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/map/model/layer/TileLayer.kt
@@ -1,6 +1,6 @@
-package com.bartlomiejpluta.base.editor.model.map.layer
+package com.bartlomiejpluta.base.editor.map.model.layer
 
-import com.bartlomiejpluta.base.editor.model.tileset.Tile
+import com.bartlomiejpluta.base.editor.tileset.model.Tile
 import javafx.beans.property.SimpleStringProperty
 import tornadofx.getValue
 import tornadofx.setValue
diff --git a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/model/map/map/GameMap.kt b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/map/model/map/GameMap.kt
similarity index 86%
rename from editor/src/main/kotlin/com/bartlomiejpluta/base/editor/model/map/map/GameMap.kt
rename to editor/src/main/kotlin/com/bartlomiejpluta/base/editor/map/model/map/GameMap.kt
index c86b4bfe..3fc19fe4 100755
--- a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/model/map/map/GameMap.kt
+++ b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/map/model/map/GameMap.kt
@@ -1,7 +1,7 @@
-package com.bartlomiejpluta.base.editor.model.map.map
+package com.bartlomiejpluta.base.editor.map.model.map
 
-import com.bartlomiejpluta.base.editor.model.map.layer.Layer
-import com.bartlomiejpluta.base.editor.model.tileset.TileSet
+import com.bartlomiejpluta.base.editor.map.model.layer.Layer
+import com.bartlomiejpluta.base.editor.tileset.model.TileSet
 import javafx.beans.property.SimpleDoubleProperty
 import javafx.beans.property.SimpleIntegerProperty
 import javafx.beans.property.SimpleStringProperty
diff --git a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/view/map/MapFragment.kt b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/map/view/MapFragment.kt
similarity index 85%
rename from editor/src/main/kotlin/com/bartlomiejpluta/base/editor/view/map/MapFragment.kt
rename to editor/src/main/kotlin/com/bartlomiejpluta/base/editor/map/view/MapFragment.kt
index 787e57d3..41aeec11 100755
--- a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/view/map/MapFragment.kt
+++ b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/map/view/MapFragment.kt
@@ -1,6 +1,7 @@
-package com.bartlomiejpluta.base.editor.view.map
+package com.bartlomiejpluta.base.editor.map.view
 
 import com.bartlomiejpluta.base.editor.command.context.UndoableScope
+import com.bartlomiejpluta.base.editor.tileset.view.TileSetView
 import tornadofx.*
 
 
diff --git a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/view/map/MapLayersView.kt b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/map/view/MapLayersView.kt
similarity index 89%
rename from editor/src/main/kotlin/com/bartlomiejpluta/base/editor/view/map/MapLayersView.kt
rename to editor/src/main/kotlin/com/bartlomiejpluta/base/editor/map/view/MapLayersView.kt
index f54ccb26..968bfdb5 100755
--- a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/view/map/MapLayersView.kt
+++ b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/map/view/MapLayersView.kt
@@ -1,4 +1,4 @@
-package com.bartlomiejpluta.base.editor.view.map
+package com.bartlomiejpluta.base.editor.map.view
 
 import com.bartlomiejpluta.base.editor.command.context.UndoableScope
 import com.bartlomiejpluta.base.editor.command.model.map.CreateLayerCommand
@@ -7,10 +7,10 @@ import com.bartlomiejpluta.base.editor.command.model.map.RemoveLayerCommand
 import com.bartlomiejpluta.base.editor.command.model.map.RenameLayerCommand
 import com.bartlomiejpluta.base.editor.command.service.UndoRedoService
 import com.bartlomiejpluta.base.editor.event.RedrawMapRequestEvent
-import com.bartlomiejpluta.base.editor.model.map.layer.Layer
-import com.bartlomiejpluta.base.editor.model.map.layer.TileLayer
-import com.bartlomiejpluta.base.editor.viewmodel.map.EditorStateVM
-import com.bartlomiejpluta.base.editor.viewmodel.map.GameMapVM
+import com.bartlomiejpluta.base.editor.map.model.layer.Layer
+import com.bartlomiejpluta.base.editor.map.model.layer.TileLayer
+import com.bartlomiejpluta.base.editor.map.viewmodel.EditorStateVM
+import com.bartlomiejpluta.base.editor.map.viewmodel.GameMapVM
 import javafx.scene.control.TableView
 import org.kordamp.ikonli.javafx.FontIcon
 import tornadofx.*
diff --git a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/view/map/MapSettingsFragment.kt b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/map/view/MapSettingsFragment.kt
similarity index 90%
rename from editor/src/main/kotlin/com/bartlomiejpluta/base/editor/view/map/MapSettingsFragment.kt
rename to editor/src/main/kotlin/com/bartlomiejpluta/base/editor/map/view/MapSettingsFragment.kt
index 07b4be70..3aed7167 100755
--- a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/view/map/MapSettingsFragment.kt
+++ b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/map/view/MapSettingsFragment.kt
@@ -1,6 +1,6 @@
-package com.bartlomiejpluta.base.editor.view.map
+package com.bartlomiejpluta.base.editor.map.view
 
-import com.bartlomiejpluta.base.editor.viewmodel.map.GameMapVM
+import com.bartlomiejpluta.base.editor.map.viewmodel.GameMapVM
 import org.kordamp.ikonli.javafx.FontIcon
 import tornadofx.*
 
diff --git a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/view/map/MapStatusBarView.kt b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/map/view/MapStatusBarView.kt
similarity index 81%
rename from editor/src/main/kotlin/com/bartlomiejpluta/base/editor/view/map/MapStatusBarView.kt
rename to editor/src/main/kotlin/com/bartlomiejpluta/base/editor/map/view/MapStatusBarView.kt
index 129ff866..598f04b2 100755
--- a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/view/map/MapStatusBarView.kt
+++ b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/map/view/MapStatusBarView.kt
@@ -1,6 +1,6 @@
-package com.bartlomiejpluta.base.editor.view.map
+package com.bartlomiejpluta.base.editor.map.view
 
-import com.bartlomiejpluta.base.editor.viewmodel.map.EditorStateVM
+import com.bartlomiejpluta.base.editor.map.viewmodel.EditorStateVM
 import javafx.beans.binding.Bindings
 import org.kordamp.ikonli.javafx.FontIcon
 import tornadofx.*
diff --git a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/view/map/MapToolbarView.kt b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/map/view/MapToolbarView.kt
similarity index 89%
rename from editor/src/main/kotlin/com/bartlomiejpluta/base/editor/view/map/MapToolbarView.kt
rename to editor/src/main/kotlin/com/bartlomiejpluta/base/editor/map/view/MapToolbarView.kt
index 8d54cd3d..669b8801 100755
--- a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/view/map/MapToolbarView.kt
+++ b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/map/view/MapToolbarView.kt
@@ -1,12 +1,12 @@
-package com.bartlomiejpluta.base.editor.view.map
+package com.bartlomiejpluta.base.editor.map.view
 
 import com.bartlomiejpluta.base.editor.command.context.UndoableScope
 import com.bartlomiejpluta.base.editor.command.service.UndoRedoService
 import com.bartlomiejpluta.base.editor.event.RedrawMapRequestEvent
-import com.bartlomiejpluta.base.editor.model.map.brush.BrushMode
-import com.bartlomiejpluta.base.editor.viewmodel.map.BrushVM
-import com.bartlomiejpluta.base.editor.viewmodel.map.EditorStateVM
-import com.bartlomiejpluta.base.editor.viewmodel.map.GameMapVM
+import com.bartlomiejpluta.base.editor.map.model.brush.BrushMode
+import com.bartlomiejpluta.base.editor.map.viewmodel.BrushVM
+import com.bartlomiejpluta.base.editor.map.viewmodel.EditorStateVM
+import com.bartlomiejpluta.base.editor.map.viewmodel.GameMapVM
 import javafx.scene.control.ToggleGroup
 import org.kordamp.ikonli.javafx.FontIcon
 import tornadofx.*
diff --git a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/view/map/MapView.kt b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/map/view/MapView.kt
similarity index 80%
rename from editor/src/main/kotlin/com/bartlomiejpluta/base/editor/view/map/MapView.kt
rename to editor/src/main/kotlin/com/bartlomiejpluta/base/editor/map/view/MapView.kt
index ed82297a..e5d18ab0 100755
--- a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/view/map/MapView.kt
+++ b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/map/view/MapView.kt
@@ -1,12 +1,12 @@
-package com.bartlomiejpluta.base.editor.view.map
+package com.bartlomiejpluta.base.editor.map.view
 
 import com.bartlomiejpluta.base.editor.command.context.UndoableScope
 import com.bartlomiejpluta.base.editor.command.service.UndoRedoService
 import com.bartlomiejpluta.base.editor.event.RedrawMapRequestEvent
-import com.bartlomiejpluta.base.editor.view.component.map.MapPane
-import com.bartlomiejpluta.base.editor.viewmodel.map.BrushVM
-import com.bartlomiejpluta.base.editor.viewmodel.map.EditorStateVM
-import com.bartlomiejpluta.base.editor.viewmodel.map.GameMapVM
+import com.bartlomiejpluta.base.editor.map.component.MapPane
+import com.bartlomiejpluta.base.editor.map.viewmodel.BrushVM
+import com.bartlomiejpluta.base.editor.map.viewmodel.EditorStateVM
+import com.bartlomiejpluta.base.editor.map.viewmodel.GameMapVM
 import javafx.scene.input.MouseButton
 import javafx.scene.input.MouseEvent
 import javafx.scene.transform.Scale
diff --git a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/viewmodel/map/BrushVM.kt b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/map/viewmodel/BrushVM.kt
similarity index 73%
rename from editor/src/main/kotlin/com/bartlomiejpluta/base/editor/viewmodel/map/BrushVM.kt
rename to editor/src/main/kotlin/com/bartlomiejpluta/base/editor/map/viewmodel/BrushVM.kt
index 1fd53d8d..ea8b10c3 100755
--- a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/viewmodel/map/BrushVM.kt
+++ b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/map/viewmodel/BrushVM.kt
@@ -1,8 +1,8 @@
-package com.bartlomiejpluta.base.editor.viewmodel.map
+package com.bartlomiejpluta.base.editor.map.viewmodel
 
-import com.bartlomiejpluta.base.editor.model.map.brush.Brush
-import com.bartlomiejpluta.base.editor.model.map.brush.BrushMode
-import com.bartlomiejpluta.base.editor.model.tileset.Tile
+import com.bartlomiejpluta.base.editor.map.model.brush.Brush
+import com.bartlomiejpluta.base.editor.map.model.brush.BrushMode
+import com.bartlomiejpluta.base.editor.tileset.model.Tile
 import tornadofx.ItemViewModel
 import tornadofx.getValue
 
diff --git a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/viewmodel/map/EditorStateVM.kt b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/map/viewmodel/EditorStateVM.kt
similarity index 91%
rename from editor/src/main/kotlin/com/bartlomiejpluta/base/editor/viewmodel/map/EditorStateVM.kt
rename to editor/src/main/kotlin/com/bartlomiejpluta/base/editor/map/viewmodel/EditorStateVM.kt
index 106e0920..fed090f7 100755
--- a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/viewmodel/map/EditorStateVM.kt
+++ b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/map/viewmodel/EditorStateVM.kt
@@ -1,4 +1,4 @@
-package com.bartlomiejpluta.base.editor.viewmodel.map
+package com.bartlomiejpluta.base.editor.map.viewmodel
 
 import javafx.beans.property.SimpleBooleanProperty
 import javafx.beans.property.SimpleDoubleProperty
diff --git a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/viewmodel/map/GameMapVM.kt b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/map/viewmodel/GameMapVM.kt
similarity index 78%
rename from editor/src/main/kotlin/com/bartlomiejpluta/base/editor/viewmodel/map/GameMapVM.kt
rename to editor/src/main/kotlin/com/bartlomiejpluta/base/editor/map/viewmodel/GameMapVM.kt
index 88f23f97..45db0cb8 100755
--- a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/viewmodel/map/GameMapVM.kt
+++ b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/map/viewmodel/GameMapVM.kt
@@ -1,8 +1,7 @@
-package com.bartlomiejpluta.base.editor.viewmodel.map
+package com.bartlomiejpluta.base.editor.map.viewmodel
 
-import com.bartlomiejpluta.base.editor.model.map.layer.Layer
-import com.bartlomiejpluta.base.editor.model.map.map.GameMap
-import javafx.beans.property.SimpleIntegerProperty
+import com.bartlomiejpluta.base.editor.map.model.layer.Layer
+import com.bartlomiejpluta.base.editor.map.model.map.GameMap
 import javafx.beans.property.SimpleListProperty
 import tornadofx.ItemViewModel
 import tornadofx.getValue
diff --git a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/model/map/brush/BrushMode.kt b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/model/map/brush/BrushMode.kt
deleted file mode 100755
index f87b840f..00000000
--- a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/model/map/brush/BrushMode.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.bartlomiejpluta.base.editor.model.map.brush
-
-enum class BrushMode {
-   PAINTING_MODE,
-   ERASING_MODE
-}
\ No newline at end of file
diff --git a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/render/canvas/input/MapMouseEvent.kt b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/render/input/MapMouseEvent.kt
similarity index 77%
rename from editor/src/main/kotlin/com/bartlomiejpluta/base/editor/render/canvas/input/MapMouseEvent.kt
rename to editor/src/main/kotlin/com/bartlomiejpluta/base/editor/render/input/MapMouseEvent.kt
index c1cd3b40..6f0d7a50 100755
--- a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/render/canvas/input/MapMouseEvent.kt
+++ b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/render/input/MapMouseEvent.kt
@@ -1,6 +1,6 @@
-package com.bartlomiejpluta.base.editor.render.canvas.input
+package com.bartlomiejpluta.base.editor.render.input
 
-import com.bartlomiejpluta.base.editor.model.tileset.TileSet
+import com.bartlomiejpluta.base.editor.tileset.model.TileSet
 import javafx.event.EventType
 import javafx.scene.input.MouseButton
 import javafx.scene.input.MouseEvent
diff --git a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/render/canvas/input/MapMouseEventHandler.kt b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/render/input/MapMouseEventHandler.kt
similarity index 55%
rename from editor/src/main/kotlin/com/bartlomiejpluta/base/editor/render/canvas/input/MapMouseEventHandler.kt
rename to editor/src/main/kotlin/com/bartlomiejpluta/base/editor/render/input/MapMouseEventHandler.kt
index a5a54cc5..4d23864d 100755
--- a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/render/canvas/input/MapMouseEventHandler.kt
+++ b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/render/input/MapMouseEventHandler.kt
@@ -1,4 +1,4 @@
-package com.bartlomiejpluta.base.editor.render.canvas.input
+package com.bartlomiejpluta.base.editor.render.input
 
 interface MapMouseEventHandler {
    fun handleMouseInput(event: MapMouseEvent)
diff --git a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/render/canvas/tileset/TileSetCanvas.kt b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/tileset/canvas/TileSetCanvas.kt
similarity index 84%
rename from editor/src/main/kotlin/com/bartlomiejpluta/base/editor/render/canvas/tileset/TileSetCanvas.kt
rename to editor/src/main/kotlin/com/bartlomiejpluta/base/editor/tileset/canvas/TileSetCanvas.kt
index 3c3a2c23..17f19c01 100755
--- a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/render/canvas/tileset/TileSetCanvas.kt
+++ b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/tileset/canvas/TileSetCanvas.kt
@@ -1,10 +1,9 @@
-package com.bartlomiejpluta.base.editor.render.canvas.tileset
+package com.bartlomiejpluta.base.editor.tileset.canvas
 
-import com.bartlomiejpluta.base.editor.render.canvas.input.MapMouseEvent
-import com.bartlomiejpluta.base.editor.render.canvas.input.MapMouseEventHandler
+import com.bartlomiejpluta.base.editor.render.input.MapMouseEvent
+import com.bartlomiejpluta.base.editor.render.input.MapMouseEventHandler
 import com.bartlomiejpluta.base.editor.render.model.Renderable
-import com.bartlomiejpluta.base.editor.viewmodel.map.BrushVM
-import com.bartlomiejpluta.base.editor.viewmodel.map.GameMapVM
+import com.bartlomiejpluta.base.editor.map.viewmodel.GameMapVM
 import javafx.scene.canvas.GraphicsContext
 import javafx.scene.input.MouseButton
 import javafx.scene.input.MouseEvent
diff --git a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/render/canvas/tileset/TileSetSelection.kt b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/tileset/canvas/TileSetSelection.kt
similarity index 87%
rename from editor/src/main/kotlin/com/bartlomiejpluta/base/editor/render/canvas/tileset/TileSetSelection.kt
rename to editor/src/main/kotlin/com/bartlomiejpluta/base/editor/tileset/canvas/TileSetSelection.kt
index 3ceae219..13d64ecd 100755
--- a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/render/canvas/tileset/TileSetSelection.kt
+++ b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/tileset/canvas/TileSetSelection.kt
@@ -1,9 +1,9 @@
-package com.bartlomiejpluta.base.editor.render.canvas.tileset
+package com.bartlomiejpluta.base.editor.tileset.canvas
 
-import com.bartlomiejpluta.base.editor.model.map.brush.Brush
+import com.bartlomiejpluta.base.editor.map.model.brush.Brush
 import com.bartlomiejpluta.base.editor.render.model.Renderable
-import com.bartlomiejpluta.base.editor.viewmodel.map.BrushVM
-import com.bartlomiejpluta.base.editor.viewmodel.map.GameMapVM
+import com.bartlomiejpluta.base.editor.map.viewmodel.BrushVM
+import com.bartlomiejpluta.base.editor.map.viewmodel.GameMapVM
 import javafx.scene.canvas.GraphicsContext
 import javafx.scene.paint.Color
 import kotlin.math.abs
diff --git a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/view/component/tileset/TileSetPane.kt b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/tileset/component/TileSetPane.kt
similarity index 67%
rename from editor/src/main/kotlin/com/bartlomiejpluta/base/editor/view/component/tileset/TileSetPane.kt
rename to editor/src/main/kotlin/com/bartlomiejpluta/base/editor/tileset/component/TileSetPane.kt
index 68c8edb4..791f6b1f 100755
--- a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/view/component/tileset/TileSetPane.kt
+++ b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/tileset/component/TileSetPane.kt
@@ -1,10 +1,10 @@
-package com.bartlomiejpluta.base.editor.view.component.tileset
+package com.bartlomiejpluta.base.editor.tileset.component
 
-import com.bartlomiejpluta.base.editor.render.canvas.input.MapMouseEvent
-import com.bartlomiejpluta.base.editor.render.canvas.tileset.TileSetCanvas
-import com.bartlomiejpluta.base.editor.render.canvas.tileset.TileSetSelection
-import com.bartlomiejpluta.base.editor.viewmodel.map.BrushVM
-import com.bartlomiejpluta.base.editor.viewmodel.map.GameMapVM
+import com.bartlomiejpluta.base.editor.render.input.MapMouseEvent
+import com.bartlomiejpluta.base.editor.tileset.canvas.TileSetCanvas
+import com.bartlomiejpluta.base.editor.tileset.canvas.TileSetSelection
+import com.bartlomiejpluta.base.editor.map.viewmodel.BrushVM
+import com.bartlomiejpluta.base.editor.map.viewmodel.GameMapVM
 import javafx.event.EventHandler
 import javafx.scene.canvas.Canvas
 import javafx.scene.input.MouseEvent
diff --git a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/model/tileset/Tile.kt b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/tileset/model/Tile.kt
similarity index 92%
rename from editor/src/main/kotlin/com/bartlomiejpluta/base/editor/model/tileset/Tile.kt
rename to editor/src/main/kotlin/com/bartlomiejpluta/base/editor/tileset/model/Tile.kt
index 14a5a72c..78a5538d 100755
--- a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/model/tileset/Tile.kt
+++ b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/tileset/model/Tile.kt
@@ -1,4 +1,4 @@
-package com.bartlomiejpluta.base.editor.model.tileset
+package com.bartlomiejpluta.base.editor.tileset.model
 
 import javafx.scene.image.Image
 
diff --git a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/model/tileset/TileSet.kt b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/tileset/model/TileSet.kt
similarity index 92%
rename from editor/src/main/kotlin/com/bartlomiejpluta/base/editor/model/tileset/TileSet.kt
rename to editor/src/main/kotlin/com/bartlomiejpluta/base/editor/tileset/model/TileSet.kt
index 2637f1fd..45c7f42c 100755
--- a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/model/tileset/TileSet.kt
+++ b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/tileset/model/TileSet.kt
@@ -1,6 +1,6 @@
-package com.bartlomiejpluta.base.editor.model.tileset
+package com.bartlomiejpluta.base.editor.tileset.model
 
-import com.bartlomiejpluta.base.editor.model.map.brush.Brush
+import com.bartlomiejpluta.base.editor.map.model.brush.Brush
 import javafx.beans.property.SimpleIntegerProperty
 import javafx.scene.image.Image
 import javafx.scene.image.PixelFormat
diff --git a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/view/map/TileSetView.kt b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/tileset/view/TileSetView.kt
similarity index 55%
rename from editor/src/main/kotlin/com/bartlomiejpluta/base/editor/view/map/TileSetView.kt
rename to editor/src/main/kotlin/com/bartlomiejpluta/base/editor/tileset/view/TileSetView.kt
index 6ecf0e38..3d876b49 100755
--- a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/view/map/TileSetView.kt
+++ b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/tileset/view/TileSetView.kt
@@ -1,8 +1,8 @@
-package com.bartlomiejpluta.base.editor.view.map
+package com.bartlomiejpluta.base.editor.tileset.view
 
-import com.bartlomiejpluta.base.editor.view.component.tileset.TileSetPane
-import com.bartlomiejpluta.base.editor.viewmodel.map.BrushVM
-import com.bartlomiejpluta.base.editor.viewmodel.map.GameMapVM
+import com.bartlomiejpluta.base.editor.tileset.component.TileSetPane
+import com.bartlomiejpluta.base.editor.map.viewmodel.BrushVM
+import com.bartlomiejpluta.base.editor.map.viewmodel.GameMapVM
 import tornadofx.View
 import tornadofx.plusAssign
 import tornadofx.scrollpane