diff --git a/src/schemas/Registries.ts b/src/Registries.ts
similarity index 95%
rename from src/schemas/Registries.ts
rename to src/Registries.ts
index 0769280f..10a4a9b2 100644
--- a/src/schemas/Registries.ts
+++ b/src/Registries.ts
@@ -1,4 +1,4 @@
-import { INode } from "../nodes/AbstractNode"
+import { INode } from "./nodes/AbstractNode"
 
 export interface Registry<T> {
   register(id: string, value: T): void
diff --git a/src/schemas/Sandbox.ts b/src/app/Sandbox.ts
similarity index 96%
rename from src/schemas/Sandbox.ts
rename to src/app/Sandbox.ts
index 803ac839..84e9686c 100644
--- a/src/schemas/Sandbox.ts
+++ b/src/app/Sandbox.ts
@@ -2,7 +2,7 @@ import { ObjectNode } from '../nodes/ObjectNode';
 import { EnumNode } from '../nodes/EnumNode';
 import { NumberNode } from '../nodes/NumberNode';
 import { BooleanNode } from '../nodes/BooleanNode';
-import { RangeNode } from '../nodes/custom/RangeNode';
+import { RangeNode } from '../minecraft/nodes/RangeNode';
 import { MapNode } from '../nodes/MapNode';
 import { StringNode } from '../nodes/StringNode';
 import { ListNode } from '../nodes/ListNode';
diff --git a/src/app/app.ts b/src/app/app.ts
index 750e642f..a4948eb7 100644
--- a/src/app/app.ts
+++ b/src/app/app.ts
@@ -1,8 +1,8 @@
 import { DataModel } from '../model/DataModel'
 import { TreeView } from '../view/TreeView'
 import { SourceView } from '../view/SourceView'
-import { ConditionSchema } from '../schemas/Condition'
-import { SandboxSchema } from '../schemas/Sandbox'
+import { ConditionSchema } from '../minecraft/schemas/Condition'
+import { SandboxSchema } from './Sandbox'
 
 const predicateModel = new DataModel(ConditionSchema)
 const sandboxModel = new DataModel(SandboxSchema)
diff --git a/src/nodes/custom/RangeNode.ts b/src/minecraft/nodes/RangeNode.ts
similarity index 99%
rename from src/nodes/custom/RangeNode.ts
rename to src/minecraft/nodes/RangeNode.ts
index 84878963..7ccd20d2 100644
--- a/src/nodes/custom/RangeNode.ts
+++ b/src/minecraft/nodes/RangeNode.ts
@@ -1,4 +1,4 @@
-import { AbstractNode, NodeMods, RenderOptions, StateNode } from '../AbstractNode'
+import { AbstractNode, NodeMods, RenderOptions, StateNode } from '../../nodes/AbstractNode'
 import { Path } from '../../model/Path'
 import { DataModel } from '../../model/DataModel'
 import { TreeView } from '../../view/TreeView'
diff --git a/src/nodes/custom/ResourceNode.ts b/src/minecraft/nodes/ResourceNode.ts
similarity index 90%
rename from src/nodes/custom/ResourceNode.ts
rename to src/minecraft/nodes/ResourceNode.ts
index 1e2bb812..4c7d8677 100644
--- a/src/nodes/custom/ResourceNode.ts
+++ b/src/minecraft/nodes/ResourceNode.ts
@@ -1,5 +1,5 @@
-import { NodeMods, RenderOptions } from '../AbstractNode'
-import { EnumNode } from '../EnumNode'
+import { NodeMods, RenderOptions } from '../../nodes/AbstractNode'
+import { EnumNode } from '../../nodes/EnumNode'
 import { Path } from '../../model/Path'
 import { TreeView, getId } from '../../view/TreeView'
 
diff --git a/src/schemas/Collections.ts b/src/minecraft/schemas/Collections.ts
similarity index 98%
rename from src/schemas/Collections.ts
rename to src/minecraft/schemas/Collections.ts
index f7b0ad01..8121c836 100644
--- a/src/schemas/Collections.ts
+++ b/src/minecraft/schemas/Collections.ts
@@ -1,4 +1,4 @@
-import { COLLECTIONS } from './Registries'
+import { COLLECTIONS } from '../../Registries'
 
 COLLECTIONS.register('conditions', [
   'alternative',
diff --git a/src/schemas/Condition.ts b/src/minecraft/schemas/Condition.ts
similarity index 79%
rename from src/schemas/Condition.ts
rename to src/minecraft/schemas/Condition.ts
index f2132fee..caed419a 100644
--- a/src/schemas/Condition.ts
+++ b/src/minecraft/schemas/Condition.ts
@@ -1,14 +1,14 @@
-import { EnumNode } from '../nodes/EnumNode';
-import { ResourceNode } from '../nodes/custom/ResourceNode';
-import { NumberNode } from '../nodes/NumberNode';
-import { BooleanNode } from '../nodes/BooleanNode';
-import { ObjectNode, Switch, Case } from '../nodes/ObjectNode';
-import { ListNode } from '../nodes/ListNode';
-import { RangeNode } from '../nodes/custom/RangeNode';
-import { MapNode } from '../nodes/MapNode';
-import { StringNode } from '../nodes/StringNode';
-import { ReferenceNode } from '../nodes/ReferenceNode';
-import { SCHEMAS, COLLECTIONS } from './Registries';
+import { EnumNode } from '../../nodes/EnumNode';
+import { ResourceNode } from '../nodes/ResourceNode';
+import { NumberNode } from '../../nodes/NumberNode';
+import { BooleanNode } from '../../nodes/BooleanNode';
+import { ObjectNode, Switch, Case } from '../../nodes/ObjectNode';
+import { ListNode } from '../../nodes/ListNode';
+import { RangeNode } from '../nodes/RangeNode';
+import { MapNode } from '../../nodes/MapNode';
+import { StringNode } from '../../nodes/StringNode';
+import { ReferenceNode } from '../../nodes/ReferenceNode';
+import { SCHEMAS, COLLECTIONS } from '../../Registries';
 
 import './Predicates'
 
diff --git a/src/schemas/Predicates.ts b/src/minecraft/schemas/Predicates.ts
similarity index 86%
rename from src/schemas/Predicates.ts
rename to src/minecraft/schemas/Predicates.ts
index ad3b1879..c54b4c7f 100644
--- a/src/schemas/Predicates.ts
+++ b/src/minecraft/schemas/Predicates.ts
@@ -1,13 +1,13 @@
-import { ObjectNode } from '../nodes/ObjectNode';
-import { ResourceNode } from '../nodes/custom/ResourceNode';
-import { EnumNode } from '../nodes/EnumNode';
-import { ListNode } from '../nodes/ListNode';
-import { RangeNode } from '../nodes/custom/RangeNode';
-import { StringNode } from '../nodes/StringNode';
-import { ReferenceNode } from '../nodes/ReferenceNode';
-import { BooleanNode } from '../nodes/BooleanNode';
-import { MapNode } from '../nodes/MapNode';
-import { SCHEMAS, COLLECTIONS } from './Registries';
+import { ObjectNode } from '../../nodes/ObjectNode';
+import { ResourceNode } from '../nodes/ResourceNode';
+import { EnumNode } from '../../nodes/EnumNode';
+import { ListNode } from '../../nodes/ListNode';
+import { RangeNode } from '../nodes/RangeNode';
+import { StringNode } from '../../nodes/StringNode';
+import { ReferenceNode } from '../../nodes/ReferenceNode';
+import { BooleanNode } from '../../nodes/BooleanNode';
+import { MapNode } from '../../nodes/MapNode';
+import { SCHEMAS, COLLECTIONS } from '../../Registries';
 
 import './Collections'
 
diff --git a/src/nodes/ReferenceNode.ts b/src/nodes/ReferenceNode.ts
index 677f9bbc..eef02fcf 100644
--- a/src/nodes/ReferenceNode.ts
+++ b/src/nodes/ReferenceNode.ts
@@ -1,7 +1,7 @@
 import { AbstractNode, NodeMods, RenderOptions, INode } from './AbstractNode'
 import { TreeView } from '../view/TreeView'
 import { Path } from '../model/Path'
-import { SCHEMAS } from '../schemas/Registries'
+import { SCHEMAS } from '../Registries'
 
 export class ReferenceNode extends AbstractNode<any> {
   protected reference: () => INode<any>