Moved many block files; work on annotation processor

core/assets/sprites/sprites.atlas

@@ -109,27 +109,6 @@ conveyortunnel
   orig: 8, 8
   offset: 0, 0
   index: -1
-core
-  rotate: false
-  xy: 627, 301
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-core-open
-  rotate: false
-  xy: 653, 305
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-core-top
-  rotate: false
-  xy: 586, 284
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
 junction
   rotate: false
   xy: 221, 24
@@ -298,13 +277,6 @@ router
   orig: 8, 8
   offset: 0, 0
   index: -1
-sortedunloader
-  rotate: false
-  xy: 435, 95
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
 sorter
   rotate: false
   xy: 445, 96
@@ -340,27 +312,6 @@ teleporter-top
   orig: 24, 24
   offset: 0, 0
   index: -1
-unloader
-  rotate: false
-  xy: 911, 377
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-vault
-  rotate: false
-  xy: 587, 232
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-weaponfactory
-  rotate: false
-  xy: 165, 82
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
 blackrock1
   rotate: false
   xy: 183, 100
@@ -1866,6 +1817,55 @@ waterextractor-top
   orig: 16, 16
   offset: 0, 0
   index: -1
+weaponfactory
+  rotate: false
+  xy: 165, 82
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+core
+  rotate: false
+  xy: 627, 301
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+core-open
+  rotate: false
+  xy: 653, 305
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+core-top
+  rotate: false
+  xy: 586, 284
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+sortedunloader
+  rotate: false
+  xy: 435, 95
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+unloader
+  rotate: false
+  xy: 911, 377
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+vault
+  rotate: false
+  xy: 587, 232
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
 block-1
   rotate: false
   xy: 189, 54