diff --git a/addons/Wol/Wol.gd b/addons/Wol/Wol.gd
index df7eeb0..e398d48 100644
--- a/addons/Wol/Wol.gd
+++ b/addons/Wol/Wol.gd
@@ -16,10 +16,10 @@ signal command(command)
 signal started
 signal finished
 
-const Constants = preload('res://addons/Wol/core/constants.gd')
-const WolCompiler = preload('res://addons/Wol/core/compiler/compiler.gd')
-const WolLibrary = preload('res://addons/Wol/core/library.gd')
-const VirtualMachine = preload('res://addons/Wol/core/virtual_machine.gd')
+const Constants = preload('res://addons/Wol/core/Constants.gd')
+const WolCompiler = preload('res://addons/Wol/core/compiler/Compiler.gd')
+const WolLibrary = preload('res://addons/Wol/core/Library.gd')
+const VirtualMachine = preload('res://addons/Wol/core/VirtualMachine.gd')
 const StandardLibrary = preload('res://addons/Wol/core/StandardLibrary.gd')
 
 export(String, FILE, '*.wol,*.yarn') var path setget set_path
diff --git a/addons/Wol/core/function_info.gd b/addons/Wol/core/FunctionInfo.gd
similarity index 92%
rename from addons/Wol/core/function_info.gd
rename to addons/Wol/core/FunctionInfo.gd
index 3e94ac2..c1c4f35 100644
--- a/addons/Wol/core/function_info.gd
+++ b/addons/Wol/core/FunctionInfo.gd
@@ -1,5 +1,5 @@
 extends Object
-var Value : GDScript = load("res://addons/Wol/core/value.gd")
+var Value : GDScript = load("res://addons/Wol/core/Value.gd")
 
 var name = ''
 # NOTE: -1 means variable arguments
diff --git a/addons/Wol/core/StandardLibrary.gd b/addons/Wol/core/StandardLibrary.gd
index 7f2c2a5..ad2f63f 100644
--- a/addons/Wol/core/StandardLibrary.gd
+++ b/addons/Wol/core/StandardLibrary.gd
@@ -1,6 +1,6 @@
-extends 'res://addons/Wol/core/library.gd'
+extends 'res://addons/Wol/core/Library.gd'
 
-const Value = preload('res://addons/Wol/core/value.gd')
+const Value = preload('res://addons/Wol/core/Value.gd')
 
 func _init():
 	register_function('Add', 2, funcref(self, 'add'), true)
diff --git a/addons/Wol/core/virtual_machine.gd b/addons/Wol/core/VirtualMachine.gd
similarity index 98%
rename from addons/Wol/core/virtual_machine.gd
rename to addons/Wol/core/VirtualMachine.gd
index b8c40d4..36817cc 100644
--- a/addons/Wol/core/virtual_machine.gd
+++ b/addons/Wol/core/VirtualMachine.gd
@@ -1,7 +1,7 @@
 extends Node
 
-const Constants = preload('res://addons/Wol/core/constants.gd')
-const Value = preload('res://addons/Wol/core/value.gd')
+const Constants = preload('res://addons/Wol/core/Constants.gd')
+const Value = preload('res://addons/Wol/core/Value.gd')
 
 # Function references to handlers
 var line_handler
diff --git a/addons/Wol/core/compiler/compiler.gd b/addons/Wol/core/compiler/compiler.gd
index f2df47f..00a6cd8 100644
--- a/addons/Wol/core/compiler/compiler.gd
+++ b/addons/Wol/core/compiler/compiler.gd
@@ -1,10 +1,9 @@
 extends Object
-class_name Compiler
 
-const Constants = preload('res://addons/Wol/core/constants.gd')
-const Lexer = preload('res://addons/Wol/core/compiler/lexer.gd')
-const Program = preload('res://addons/Wol/core/program.gd')
-const Parser = preload('res://addons/Wol/core/compiler/parser.gd')
+const Constants = preload('res://addons/Wol/core/Constants.gd')
+const Lexer = preload('res://addons/Wol/core/compiler/Lexer.gd')
+const Program = preload('res://addons/Wol/core/Program.gd')
+const Parser = preload('res://addons/Wol/core/compiler/Parser.gd')
 
 const INVALID_TITLE = '[\\[<>\\]{}\\|:\\s#\\$]'
 
diff --git a/addons/Wol/core/compiler/lexer.gd b/addons/Wol/core/compiler/lexer.gd
index 16add19..929772f 100644
--- a/addons/Wol/core/compiler/lexer.gd
+++ b/addons/Wol/core/compiler/lexer.gd
@@ -1,7 +1,6 @@
 extends Object
-class_name Lexer
 
-const Constants = preload('res://addons/Wol/core/constants.gd')
+const Constants = preload('res://addons/Wol/core/Constants.gd')
 
 const LINE_COMENT = '//'
 const FORWARD_SLASH = '/'
diff --git a/addons/Wol/core/compiler/parser.gd b/addons/Wol/core/compiler/parser.gd
index 2cf626c..f27dfb9 100644
--- a/addons/Wol/core/compiler/parser.gd
+++ b/addons/Wol/core/compiler/parser.gd
@@ -1,7 +1,8 @@
 extends Object
 
-const Constants = preload('res://addons/Wol/core/constants.gd')
-const Lexer = preload('res://addons/Wol/core/compiler/lexer.gd')
+const Constants = preload('res://addons/Wol/core/Constants.gd')
+const Lexer = preload('res://addons/Wol/core/compiler/Lexer.gd')
+const Value = preload('res://addons/Wol/core/Value.gd')
 
 var tokens = []
 var title = ''
@@ -505,8 +506,6 @@ class IfStatement extends ParseNode:
 	pass
 
 class ValueNode extends ParseNode:
-	const Value = preload('res://addons/Wol/core/value.gd')
-	const Lexer = preload('res://addons/Wol/core/compiler/lexer.gd')
 	var value
 
 	func _init(parent, parser, token = null).(parent, parser):
diff --git a/addons/Wol/core/constants.gd b/addons/Wol/core/constants.gd
index 9eb7725..5c818c0 100644
--- a/addons/Wol/core/constants.gd
+++ b/addons/Wol/core/constants.gd
@@ -1,5 +1,4 @@
 extends Object
-class_name Constants
 
 enum ExecutionState {
 	Stopped,
diff --git a/addons/Wol/core/dialogue.gd b/addons/Wol/core/dialogue.gd
deleted file mode 100644
index 67c6b9c..0000000
--- a/addons/Wol/core/dialogue.gd
+++ /dev/null
@@ -1,54 +0,0 @@
-extends Node
-
-const Constants = preload('res://addons/Wol/core/constants.gd')
-const VirtualMachine = preload('res://addons/Wol/core/virtual_machine.gd')
-const Value = preload('res://addons/Wol/core/value.gd')
-
-var _variableStorage
-
-var _program
-var library
-
-var _vm
-var _visitedNodeCount = {}
-
-func _init(variableStorage):
-	_variableStorage = variableStorage
-
-func is_active():
-	return get_exec_state() != Constants.ExecutionState.Stopped
-
-func set_selected_option(option):
-	_vm.set_selected_option(option)
-
-func set_node(name = 'Start'):
-	_vm.set_node(name)
-
-func start():
-	if _vm.executionState == Constants.ExecutionState.Stopped:
-		_vm.resume()
-
-func resume():
-	if _vm.executionState == Constants.ExecutionState.Running \
-			or _vm.executionState == Constants.ExecutionState.Stopped:
-		return
-	_vm.resume()
-
-func pause():
-	_vm.pause()
-
-func stop():
-	_vm.stop()
-
-func node_exists(name):
-	return _program.nodes.has(name)
-
-func set_program(program):
-	_program = program
-	_vm.set_program(_program)
-	_vm.reset()
-
-func get_vm():
-	return _vm
-
-
diff --git a/addons/Wol/core/library.gd b/addons/Wol/core/library.gd
index b1d91d7..cd40a0d 100644
--- a/addons/Wol/core/library.gd
+++ b/addons/Wol/core/library.gd
@@ -1,7 +1,7 @@
 extends Object
 
-const FunctionInfo = preload('res://addons/Wol/core/function_info.gd')
-const Constants = preload('res://addons/Wol/core/constants.gd')
+const FunctionInfo = preload('res://addons/Wol/core/FunctionInfo.gd')
+const Constants = preload('res://addons/Wol/core/Constants.gd')
 
 var functions = {}
 var virtual_machine
diff --git a/addons/Wol/core/program.gd b/addons/Wol/core/program.gd
index a87736a..ebd57ad 100644
--- a/addons/Wol/core/program.gd
+++ b/addons/Wol/core/program.gd
@@ -1,7 +1,6 @@
 extends Object
-class_name Program
 
-const Constants = preload('res://addons/Wol/core/constants.gd')
+const Constants = preload('res://addons/Wol/core/Constants.gd')
 
 var name = ''
 var strings = {}
diff --git a/addons/Wol/core/value.gd b/addons/Wol/core/value.gd
index f746a81..417c4e5 100644
--- a/addons/Wol/core/value.gd
+++ b/addons/Wol/core/value.gd
@@ -1,6 +1,6 @@
 extends Object
 
-const Constants = preload('res://addons/Wol/core/constants.gd')
+const Constants = preload('res://addons/Wol/core/Constants.gd')
 
 const NULL_STRING = 'null'
 const FALSE_STRING = 'false'
diff --git a/addons/Wol/core/variable_storage.gd b/addons/Wol/core/variable_storage.gd
index 8487614..776588c 100644
--- a/addons/Wol/core/variable_storage.gd
+++ b/addons/Wol/core/variable_storage.gd
@@ -2,7 +2,7 @@ extends Node
 
 signal values_changed
 
-const Value = preload("res://addons/Wol/core/value.gd")
+const Value = preload("res://addons/Wol/core/Value.gd")
 
 var variables = {}
 
diff --git a/addons/Wol/plugin.gd b/addons/Wol/plugin.gd
index 6634be0..8e18e20 100644
--- a/addons/Wol/plugin.gd
+++ b/addons/Wol/plugin.gd
@@ -9,6 +9,5 @@ func _enter_tree():
 		load('res://addons/Wol/assets/icon.png')
 	)
 
-
 func _exit_tree():
 	remove_custom_type('Wol')
diff --git a/project.godot b/project.godot
index 5ae01c0..baff818 100644
--- a/project.godot
+++ b/project.godot
@@ -12,22 +12,17 @@ _global_script_classes=[ {
 "base": "Object",
 "class": "Compiler",
 "language": "GDScript",
-"path": "res://addons/Wol/core/compiler/compiler.gd"
-}, {
-"base": "Object",
-"class": "Constants",
-"language": "GDScript",
-"path": "res://addons/Wol/core/constants.gd"
+"path": "res://addons/Wol/core/compiler/Compiler.gd"
 }, {
 "base": "Object",
 "class": "Lexer",
 "language": "GDScript",
-"path": "res://addons/Wol/core/compiler/lexer.gd"
+"path": "res://addons/Wol/core/compiler/Lexer.gd"
 }, {
 "base": "Object",
 "class": "Program",
 "language": "GDScript",
-"path": "res://addons/Wol/core/program.gd"
+"path": "res://addons/Wol/core/Program.gd"
 }, {
 "base": "Node",
 "class": "Wol",
@@ -36,7 +31,6 @@ _global_script_classes=[ {
 } ]
 _global_script_class_icons={
 "Compiler": "",
-"Constants": "",
 "Lexer": "",
 "Program": "",
 "Wol": ""