153 files changed, 87 insertions, 79 deletions
diff --git a/src/kvirc/CMakeLists.txt b/src/kvirc/CMakeLists.txt
index 251327c0c..f60ad39d0 100644
--- a/src/kvirc/CMakeLists.txt
+++ b/src/kvirc/CMakeLists.txt
@@ -3,6 +3,10 @@
 INCLUDE_DIRECTORIES(
 	kernel
 	kvs
+	kvs/event
+	kvs/object
+	kvs/parser
+	kvs/tree
 	module
 	sparser
 	ui
@@ -73,13 +77,13 @@ SET(kvirc_MOC_HDRS
 	kvs/KviKvsAsyncDnsOperation.h
 	kvs/KviKvsAsyncOperation.h
 	kvs/KviKvsDnsManager.h
-	kvs/KviKvsEventManager.h
-	kvs/KviKvsObject.h
 	kvs/KviKvsPopupMenu.h
 	kvs/KviKvsPopupManager.h
 	kvs/KviKvsProcessManager.h
 	kvs/KviKvsTimerManager.h
 	kvs/KviKvsUserAction.h
+	kvs/event/KviKvsEventManager.h
+	kvs/object/KviKvsObject.h
 	kernel/KviAction.h
 	kernel/KviActionManager.h
 	kernel/KviApplication.h
@@ -184,27 +188,10 @@ SET(kvirc_SRCS
 	kvs/KviKvsCoreSimpleCommands_mr.cpp
 	kvs/KviKvsCoreSimpleCommands_sz.cpp
 	kvs/KviKvsDnsManager.cpp
-	kvs/KviKvsEvent.cpp
-	kvs/KviKvsEventHandler.cpp
-	kvs/KviKvsEventManager.cpp
-	kvs/KviKvsEventTable.cpp
 	kvs/KviKvsHash.cpp
 	kvs/KviKvsKernel.cpp
 	kvs/KviKvsModuleInterface.cpp
-	kvs/KviKvsObject.cpp
-	kvs/KviKvsObjectClass.cpp
-	kvs/KviKvsObjectController.cpp
-	kvs/KviKvsObjectFunctionCall.cpp
-	kvs/KviKvsObjectFunctionHandler.cpp
-	kvs/KviKvsObjectFunctionHandlerImpl.cpp
 	kvs/KviKvsParameterProcessor.cpp
-	kvs/KviKvsParser.cpp
-	kvs/KviKvsParser_command.cpp
-	kvs/KviKvsParser_comment.cpp
-	kvs/KviKvsParser_dollar.cpp
-	kvs/KviKvsParser_expression.cpp
-	kvs/KviKvsParser_lside.cpp
-	kvs/KviKvsParser_specialCommands.cpp
 	kvs/KviKvsPopupManager.cpp
 	kvs/KviKvsPopupMenu.cpp
 	kvs/KviKvsProcessManager.cpp
@@ -216,69 +203,86 @@ SET(kvirc_SRCS
 	kvs/KviKvsScriptAddonManager.cpp
 	kvs/KviKvsSwitchList.cpp
 	kvs/KviKvsTimerManager.cpp
-	kvs/KviKvsTreeNodeAliasFunctionCall.cpp
-	kvs/KviKvsTreeNodeAliasSimpleCommand.cpp
-	kvs/KviKvsTreeNodeArrayCount.cpp
-	kvs/KviKvsTreeNodeArrayElement.cpp
-	kvs/KviKvsTreeNodeArrayOrHashElement.cpp
-	kvs/KviKvsTreeNodeArrayReferenceAssert.cpp
-	kvs/KviKvsTreeNodeBase.cpp
-	kvs/KviKvsTreeNodeBaseObjectFunctionCall.cpp
-	kvs/KviKvsTreeNodeCallbackCommand.cpp
-	kvs/KviKvsTreeNodeCommand.cpp
-	kvs/KviKvsTreeNodeCommandEvaluation.cpp
-	kvs/KviKvsTreeNodeCommandWithParameters.cpp
-	kvs/KviKvsTreeNodeCompositeData.cpp
-	kvs/KviKvsTreeNodeConstantData.cpp
-	kvs/KviKvsTreeNodeCoreCallbackCommand.cpp
-	kvs/KviKvsTreeNodeCoreFunctionCall.cpp
-	kvs/KviKvsTreeNodeCoreSimpleCommand.cpp
-	kvs/KviKvsTreeNodeData.cpp
-	kvs/KviKvsTreeNodeDataList.cpp
-	kvs/KviKvsTreeNodeExpression.cpp
-	kvs/KviKvsTreeNodeExpressionReturn.cpp
-	kvs/KviKvsTreeNodeExtendedScopeVariable.cpp
-	kvs/KviKvsTreeNodeFunctionCall.cpp
-	kvs/KviKvsTreeNodeGlobalVariable.cpp
-	kvs/KviKvsTreeNodeHashCount.cpp
-	kvs/KviKvsTreeNodeHashElement.cpp
-	kvs/KviKvsTreeNodeHashReferenceAssert.cpp
-	kvs/KviKvsTreeNodeIndirectData.cpp
-	kvs/KviKvsTreeNodeInstruction.cpp
-	kvs/KviKvsTreeNodeInstructionBlock.cpp
-	kvs/KviKvsTreeNodeLocalVariable.cpp
-	kvs/KviKvsTreeNodeModuleCallbackCommand.cpp
-	kvs/KviKvsTreeNodeModuleFunctionCall.cpp
-	kvs/KviKvsTreeNodeModuleSimpleCommand.cpp
-	kvs/KviKvsTreeNodeMultipleParameterIdentifier.cpp
-	kvs/KviKvsTreeNodeObjectField.cpp
-	kvs/KviKvsTreeNodeObjectFunctionCall.cpp
-	kvs/KviKvsTreeNodeOperation.cpp
-	kvs/KviKvsTreeNodeParameterReturn.cpp
-	kvs/KviKvsTreeNodeRebindingSwitch.cpp
-	kvs/KviKvsTreeNodeScopeOperator.cpp
-	kvs/KviKvsTreeNodeSimpleCommand.cpp
-	kvs/KviKvsTreeNodeSingleParameterIdentifier.cpp
-	kvs/KviKvsTreeNodeSpecialCommand.cpp
-	kvs/KviKvsTreeNodeSpecialCommandBreak.cpp
-	kvs/KviKvsTreeNodeSpecialCommandClass.cpp
-	kvs/KviKvsTreeNodeSpecialCommandContinue.cpp
-	kvs/KviKvsTreeNodeSpecialCommandDefpopup.cpp
-	kvs/KviKvsTreeNodeSpecialCommandDo.cpp
-	kvs/KviKvsTreeNodeSpecialCommandFor.cpp
-	kvs/KviKvsTreeNodeSpecialCommandForeach.cpp
-	kvs/KviKvsTreeNodeSpecialCommandIf.cpp
-	kvs/KviKvsTreeNodeSpecialCommandSwitch.cpp
-	kvs/KviKvsTreeNodeSpecialCommandUnset.cpp
-	kvs/KviKvsTreeNodeSpecialCommandWhile.cpp
-	kvs/KviKvsTreeNodeStringCase.cpp
-	kvs/KviKvsTreeNodeSwitchList.cpp
-	kvs/KviKvsTreeNodeThisObjectFunctionCall.cpp
-	kvs/KviKvsTreeNodeVariable.cpp
-	kvs/KviKvsTreeNodeVoidFunctionCall.cpp
 	kvs/KviKvsUserAction.cpp
 	kvs/KviKvsVariant.cpp
 	kvs/KviKvsVariantList.cpp
+	kvs/event/KviKvsEvent.cpp
+	kvs/event/KviKvsEventHandler.cpp
+	kvs/event/KviKvsEventManager.cpp
+	kvs/event/KviKvsEventTable.cpp
+	kvs/object/KviKvsObject.cpp
+	kvs/object/KviKvsObjectClass.cpp
+	kvs/object/KviKvsObjectController.cpp
+	kvs/object/KviKvsObjectFunctionCall.cpp
+	kvs/object/KviKvsObjectFunctionHandler.cpp
+	kvs/object/KviKvsObjectFunctionHandlerImpl.cpp
+	kvs/parser/KviKvsParser.cpp
+	kvs/parser/KviKvsParser_command.cpp
+	kvs/parser/KviKvsParser_comment.cpp
+	kvs/parser/KviKvsParser_dollar.cpp
+	kvs/parser/KviKvsParser_expression.cpp
+	kvs/parser/KviKvsParser_lside.cpp
+	kvs/parser/KviKvsParser_specialCommands.cpp
+	kvs/tree/KviKvsTreeNodeAliasFunctionCall.cpp
+	kvs/tree/KviKvsTreeNodeAliasSimpleCommand.cpp
+	kvs/tree/KviKvsTreeNodeArrayCount.cpp
+	kvs/tree/KviKvsTreeNodeArrayElement.cpp
+	kvs/tree/KviKvsTreeNodeArrayOrHashElement.cpp
+	kvs/tree/KviKvsTreeNodeArrayReferenceAssert.cpp
+	kvs/tree/KviKvsTreeNodeBase.cpp
+	kvs/tree/KviKvsTreeNodeBaseObjectFunctionCall.cpp
+	kvs/tree/KviKvsTreeNodeCallbackCommand.cpp
+	kvs/tree/KviKvsTreeNodeCommand.cpp
+	kvs/tree/KviKvsTreeNodeCommandEvaluation.cpp
+	kvs/tree/KviKvsTreeNodeCommandWithParameters.cpp
+	kvs/tree/KviKvsTreeNodeCompositeData.cpp
+	kvs/tree/KviKvsTreeNodeConstantData.cpp
+	kvs/tree/KviKvsTreeNodeCoreCallbackCommand.cpp
+	kvs/tree/KviKvsTreeNodeCoreFunctionCall.cpp
+	kvs/tree/KviKvsTreeNodeCoreSimpleCommand.cpp
+	kvs/tree/KviKvsTreeNodeData.cpp
+	kvs/tree/KviKvsTreeNodeDataList.cpp
+	kvs/tree/KviKvsTreeNodeExpression.cpp
+	kvs/tree/KviKvsTreeNodeExpressionReturn.cpp
+	kvs/tree/KviKvsTreeNodeExtendedScopeVariable.cpp
+	kvs/tree/KviKvsTreeNodeFunctionCall.cpp
+	kvs/tree/KviKvsTreeNodeGlobalVariable.cpp
+	kvs/tree/KviKvsTreeNodeHashCount.cpp
+	kvs/tree/KviKvsTreeNodeHashElement.cpp
+	kvs/tree/KviKvsTreeNodeHashReferenceAssert.cpp
+	kvs/tree/KviKvsTreeNodeIndirectData.cpp
+	kvs/tree/KviKvsTreeNodeInstruction.cpp
+	kvs/tree/KviKvsTreeNodeInstructionBlock.cpp
+	kvs/tree/KviKvsTreeNodeLocalVariable.cpp
+	kvs/tree/KviKvsTreeNodeModuleCallbackCommand.cpp
+	kvs/tree/KviKvsTreeNodeModuleFunctionCall.cpp
+	kvs/tree/KviKvsTreeNodeModuleSimpleCommand.cpp
+	kvs/tree/KviKvsTreeNodeMultipleParameterIdentifier.cpp
+	kvs/tree/KviKvsTreeNodeObjectField.cpp
+	kvs/tree/KviKvsTreeNodeObjectFunctionCall.cpp
+	kvs/tree/KviKvsTreeNodeOperation.cpp
+	kvs/tree/KviKvsTreeNodeParameterReturn.cpp
+	kvs/tree/KviKvsTreeNodeRebindingSwitch.cpp
+	kvs/tree/KviKvsTreeNodeScopeOperator.cpp
+	kvs/tree/KviKvsTreeNodeSimpleCommand.cpp
+	kvs/tree/KviKvsTreeNodeSingleParameterIdentifier.cpp
+	kvs/tree/KviKvsTreeNodeSpecialCommand.cpp
+	kvs/tree/KviKvsTreeNodeSpecialCommandBreak.cpp
+	kvs/tree/KviKvsTreeNodeSpecialCommandClass.cpp
+	kvs/tree/KviKvsTreeNodeSpecialCommandContinue.cpp
+	kvs/tree/KviKvsTreeNodeSpecialCommandDefpopup.cpp
+	kvs/tree/KviKvsTreeNodeSpecialCommandDo.cpp
+	kvs/tree/KviKvsTreeNodeSpecialCommandFor.cpp
+	kvs/tree/KviKvsTreeNodeSpecialCommandForeach.cpp
+	kvs/tree/KviKvsTreeNodeSpecialCommandIf.cpp
+	kvs/tree/KviKvsTreeNodeSpecialCommandSwitch.cpp
+	kvs/tree/KviKvsTreeNodeSpecialCommandUnset.cpp
+	kvs/tree/KviKvsTreeNodeSpecialCommandWhile.cpp
+	kvs/tree/KviKvsTreeNodeStringCase.cpp
+	kvs/tree/KviKvsTreeNodeSwitchList.cpp
+	kvs/tree/KviKvsTreeNodeThisObjectFunctionCall.cpp
+	kvs/tree/KviKvsTreeNodeVariable.cpp
+	kvs/tree/KviKvsTreeNodeVoidFunctionCall.cpp
 	kernel/KviAction.cpp
 	kernel/KviActionManager.cpp
 	kernel/KviApplication.cpp
diff --git a/src/kvirc/kvs/KviKvsEvent.cpp b/src/kvirc/kvs/event/KviKvsEvent.cpp
index 5d170ce89..5d170ce89 100644
--- a/src/kvirc/kvs/KviKvsEvent.cpp
+++ b/src/kvirc/kvs/event/KviKvsEvent.cpp
diff --git a/src/kvirc/kvs/KviKvsEvent.h b/src/kvirc/kvs/event/KviKvsEvent.h
index 1495a4fea..1495a4fea 100644
--- a/src/kvirc/kvs/KviKvsEvent.h
+++ b/src/kvirc/kvs/event/KviKvsEvent.h
diff --git a/src/kvirc/kvs/KviKvsEventHandler.cpp b/src/kvirc/kvs/event/KviKvsEventHandler.cpp
index b29f3ba9a..b29f3ba9a 100644
--- a/src/kvirc/kvs/KviKvsEventHandler.cpp
+++ b/src/kvirc/kvs/event/KviKvsEventHandler.cpp
diff --git a/src/kvirc/kvs/KviKvsEventHandler.h b/src/kvirc/kvs/event/KviKvsEventHandler.h
index 148c8bbee..148c8bbee 100644
--- a/src/kvirc/kvs/KviKvsEventHandler.h
+++ b/src/kvirc/kvs/event/KviKvsEventHandler.h
diff --git a/src/kvirc/kvs/KviKvsEventManager.cpp b/src/kvirc/kvs/event/KviKvsEventManager.cpp
index 024c2d84b..024c2d84b 100644
--- a/src/kvirc/kvs/KviKvsEventManager.cpp
+++ b/src/kvirc/kvs/event/KviKvsEventManager.cpp
diff --git a/src/kvirc/kvs/KviKvsEventManager.h b/src/kvirc/kvs/event/KviKvsEventManager.h
index a601b4a62..a601b4a62 100644
--- a/src/kvirc/kvs/KviKvsEventManager.h
+++ b/src/kvirc/kvs/event/KviKvsEventManager.h
diff --git a/src/kvirc/kvs/KviKvsEventTable.cpp b/src/kvirc/kvs/event/KviKvsEventTable.cpp
index 0fe3af6af..0fe3af6af 100644
--- a/src/kvirc/kvs/KviKvsEventTable.cpp
+++ b/src/kvirc/kvs/event/KviKvsEventTable.cpp
diff --git a/src/kvirc/kvs/KviKvsEventTable.h b/src/kvirc/kvs/event/KviKvsEventTable.h
index 22dbbfd4b..22dbbfd4b 100644
--- a/src/kvirc/kvs/KviKvsEventTable.h
+++ b/src/kvirc/kvs/event/KviKvsEventTable.h
diff --git a/src/kvirc/kvs/KviKvsEventTriggers.h b/src/kvirc/kvs/event/KviKvsEventTriggers.h
index 73898c3c2..73898c3c2 100644
--- a/src/kvirc/kvs/KviKvsEventTriggers.h
+++ b/src/kvirc/kvs/event/KviKvsEventTriggers.h
diff --git a/src/kvirc/kvs/KviKvsObject.cpp b/src/kvirc/kvs/object/KviKvsObject.cpp
index 857e2d139..857e2d139 100644
--- a/src/kvirc/kvs/KviKvsObject.cpp
+++ b/src/kvirc/kvs/object/KviKvsObject.cpp
diff --git a/src/kvirc/kvs/KviKvsObject.h b/src/kvirc/kvs/object/KviKvsObject.h
index 60bc44433..60bc44433 100644
--- a/src/kvirc/kvs/KviKvsObject.h
+++ b/src/kvirc/kvs/object/KviKvsObject.h
diff --git a/src/kvirc/kvs/KviKvsObjectClass.cpp b/src/kvirc/kvs/object/KviKvsObjectClass.cpp
index 1240910a6..1240910a6 100644
--- a/src/kvirc/kvs/KviKvsObjectClass.cpp
+++ b/src/kvirc/kvs/object/KviKvsObjectClass.cpp
diff --git a/src/kvirc/kvs/KviKvsObjectClass.h b/src/kvirc/kvs/object/KviKvsObjectClass.h
index 0845c1cb6..0845c1cb6 100644
--- a/src/kvirc/kvs/KviKvsObjectClass.h
+++ b/src/kvirc/kvs/object/KviKvsObjectClass.h
diff --git a/src/kvirc/kvs/KviKvsObjectController.cpp b/src/kvirc/kvs/object/KviKvsObjectController.cpp
index 4d9105021..4d9105021 100644
--- a/src/kvirc/kvs/KviKvsObjectController.cpp
+++ b/src/kvirc/kvs/object/KviKvsObjectController.cpp
diff --git a/src/kvirc/kvs/KviKvsObjectController.h b/src/kvirc/kvs/object/KviKvsObjectController.h
index 9e4b5b790..9e4b5b790 100644
--- a/src/kvirc/kvs/KviKvsObjectController.h
+++ b/src/kvirc/kvs/object/KviKvsObjectController.h
diff --git a/src/kvirc/kvs/KviKvsObjectFunctionCall.cpp b/src/kvirc/kvs/object/KviKvsObjectFunctionCall.cpp
index c873ab645..c873ab645 100644
--- a/src/kvirc/kvs/KviKvsObjectFunctionCall.cpp
+++ b/src/kvirc/kvs/object/KviKvsObjectFunctionCall.cpp
diff --git a/src/kvirc/kvs/KviKvsObjectFunctionCall.h b/src/kvirc/kvs/object/KviKvsObjectFunctionCall.h
index 86cb2a3f5..86cb2a3f5 100644
--- a/src/kvirc/kvs/KviKvsObjectFunctionCall.h
+++ b/src/kvirc/kvs/object/KviKvsObjectFunctionCall.h
diff --git a/src/kvirc/kvs/KviKvsObjectFunctionHandler.cpp b/src/kvirc/kvs/object/KviKvsObjectFunctionHandler.cpp
index 032f7aa73..032f7aa73 100644
--- a/src/kvirc/kvs/KviKvsObjectFunctionHandler.cpp
+++ b/src/kvirc/kvs/object/KviKvsObjectFunctionHandler.cpp
diff --git a/src/kvirc/kvs/KviKvsObjectFunctionHandler.h b/src/kvirc/kvs/object/KviKvsObjectFunctionHandler.h
index 05a23173c..05a23173c 100644
--- a/src/kvirc/kvs/KviKvsObjectFunctionHandler.h
+++ b/src/kvirc/kvs/object/KviKvsObjectFunctionHandler.h
diff --git a/src/kvirc/kvs/KviKvsObjectFunctionHandlerImpl.cpp b/src/kvirc/kvs/object/KviKvsObjectFunctionHandlerImpl.cpp
index e885cf843..e885cf843 100644
--- a/src/kvirc/kvs/KviKvsObjectFunctionHandlerImpl.cpp
+++ b/src/kvirc/kvs/object/KviKvsObjectFunctionHandlerImpl.cpp
diff --git a/src/kvirc/kvs/KviKvsObjectFunctionHandlerImpl.h b/src/kvirc/kvs/object/KviKvsObjectFunctionHandlerImpl.h
index fb4d824ff..fb4d824ff 100644
--- a/src/kvirc/kvs/KviKvsObjectFunctionHandlerImpl.h
+++ b/src/kvirc/kvs/object/KviKvsObjectFunctionHandlerImpl.h
diff --git a/src/kvirc/kvs/KviKvsParser.cpp b/src/kvirc/kvs/parser/KviKvsParser.cpp
index 30a0777b5..30a0777b5 100644
--- a/src/kvirc/kvs/KviKvsParser.cpp
+++ b/src/kvirc/kvs/parser/KviKvsParser.cpp
diff --git a/src/kvirc/kvs/KviKvsParser.h b/src/kvirc/kvs/parser/KviKvsParser.h
index aa21b5cb0..aa21b5cb0 100644
--- a/src/kvirc/kvs/KviKvsParser.h
+++ b/src/kvirc/kvs/parser/KviKvsParser.h
diff --git a/src/kvirc/kvs/KviKvsParserMacros.h b/src/kvirc/kvs/parser/KviKvsParserMacros.h
index c9129fb61..c9129fb61 100644
--- a/src/kvirc/kvs/KviKvsParserMacros.h
+++ b/src/kvirc/kvs/parser/KviKvsParserMacros.h
diff --git a/src/kvirc/kvs/KviKvsParser_command.cpp b/src/kvirc/kvs/parser/KviKvsParser_command.cpp
index 284f2cc06..284f2cc06 100644
--- a/src/kvirc/kvs/KviKvsParser_command.cpp
+++ b/src/kvirc/kvs/parser/KviKvsParser_command.cpp
diff --git a/src/kvirc/kvs/KviKvsParser_comment.cpp b/src/kvirc/kvs/parser/KviKvsParser_comment.cpp
index 5f5b8df93..5f5b8df93 100644
--- a/src/kvirc/kvs/KviKvsParser_comment.cpp
+++ b/src/kvirc/kvs/parser/KviKvsParser_comment.cpp
diff --git a/src/kvirc/kvs/KviKvsParser_dollar.cpp b/src/kvirc/kvs/parser/KviKvsParser_dollar.cpp
index e77e09fe3..e77e09fe3 100644
--- a/src/kvirc/kvs/KviKvsParser_dollar.cpp
+++ b/src/kvirc/kvs/parser/KviKvsParser_dollar.cpp
diff --git a/src/kvirc/kvs/KviKvsParser_expression.cpp b/src/kvirc/kvs/parser/KviKvsParser_expression.cpp
index f535b150c..f535b150c 100644
--- a/src/kvirc/kvs/KviKvsParser_expression.cpp
+++ b/src/kvirc/kvs/parser/KviKvsParser_expression.cpp
diff --git a/src/kvirc/kvs/KviKvsParser_lside.cpp b/src/kvirc/kvs/parser/KviKvsParser_lside.cpp
index fb161f0de..fb161f0de 100644
--- a/src/kvirc/kvs/KviKvsParser_lside.cpp
+++ b/src/kvirc/kvs/parser/KviKvsParser_lside.cpp
diff --git a/src/kvirc/kvs/KviKvsParser_specialCommands.cpp b/src/kvirc/kvs/parser/KviKvsParser_specialCommands.cpp
index 3265912a5..3265912a5 100644
--- a/src/kvirc/kvs/KviKvsParser_specialCommands.cpp
+++ b/src/kvirc/kvs/parser/KviKvsParser_specialCommands.cpp
diff --git a/src/kvirc/kvs/KviKvsTreeNode.h b/src/kvirc/kvs/tree/KviKvsTreeNode.h
index 04d83a871..04d83a871 100644
--- a/src/kvirc/kvs/KviKvsTreeNode.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNode.h
diff --git a/src/kvirc/kvs/KviKvsTreeNodeAliasFunctionCall.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeAliasFunctionCall.cpp
index 0471b3a44..0471b3a44 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeAliasFunctionCall.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeAliasFunctionCall.cpp
diff --git a/src/kvirc/kvs/KviKvsTreeNodeAliasFunctionCall.h b/src/kvirc/kvs/tree/KviKvsTreeNodeAliasFunctionCall.h
index e2024aa6d..e2024aa6d 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeAliasFunctionCall.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeAliasFunctionCall.h
diff --git a/src/kvirc/kvs/KviKvsTreeNodeAliasSimpleCommand.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeAliasSimpleCommand.cpp
index 959cc413d..959cc413d 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeAliasSimpleCommand.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeAliasSimpleCommand.cpp
diff --git a/src/kvirc/kvs/KviKvsTreeNodeAliasSimpleCommand.h b/src/kvirc/kvs/tree/KviKvsTreeNodeAliasSimpleCommand.h
index e6e15c102..e6e15c102 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeAliasSimpleCommand.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeAliasSimpleCommand.h
diff --git a/src/kvirc/kvs/KviKvsTreeNodeArrayCount.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeArrayCount.cpp
index 85b65f624..85b65f624 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeArrayCount.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeArrayCount.cpp
diff --git a/src/kvirc/kvs/KviKvsTreeNodeArrayCount.h b/src/kvirc/kvs/tree/KviKvsTreeNodeArrayCount.h
index fd590a2e3..fd590a2e3 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeArrayCount.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeArrayCount.h
diff --git a/src/kvirc/kvs/KviKvsTreeNodeArrayElement.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeArrayElement.cpp
index bcfe4c337..bcfe4c337 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeArrayElement.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeArrayElement.cpp
diff --git a/src/kvirc/kvs/KviKvsTreeNodeArrayElement.h b/src/kvirc/kvs/tree/KviKvsTreeNodeArrayElement.h
index c39658a69..c39658a69 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeArrayElement.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeArrayElement.h
diff --git a/src/kvirc/kvs/KviKvsTreeNodeArrayOrHashElement.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeArrayOrHashElement.cpp
index 4a8b59436..4a8b59436 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeArrayOrHashElement.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeArrayOrHashElement.cpp
diff --git a/src/kvirc/kvs/KviKvsTreeNodeArrayOrHashElement.h b/src/kvirc/kvs/tree/KviKvsTreeNodeArrayOrHashElement.h
index 2f5039542..2f5039542 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeArrayOrHashElement.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeArrayOrHashElement.h
diff --git a/src/kvirc/kvs/KviKvsTreeNodeArrayReferenceAssert.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeArrayReferenceAssert.cpp
index d802434fb..d802434fb 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeArrayReferenceAssert.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeArrayReferenceAssert.cpp
diff --git a/src/kvirc/kvs/KviKvsTreeNodeArrayReferenceAssert.h b/src/kvirc/kvs/tree/KviKvsTreeNodeArrayReferenceAssert.h
index 3e91f9835..3e91f9835 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeArrayReferenceAssert.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeArrayReferenceAssert.h
diff --git a/src/kvirc/kvs/KviKvsTreeNodeBase.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeBase.cpp
index af34fa7e0..af34fa7e0 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeBase.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeBase.cpp
diff --git a/src/kvirc/kvs/KviKvsTreeNodeBase.h b/src/kvirc/kvs/tree/KviKvsTreeNodeBase.h
index f87b034df..f87b034df 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeBase.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeBase.h
diff --git a/src/kvirc/kvs/KviKvsTreeNodeBaseObjectFunctionCall.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeBaseObjectFunctionCall.cpp
index 019f39650..019f39650 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeBaseObjectFunctionCall.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeBaseObjectFunctionCall.cpp
diff --git a/src/kvirc/kvs/KviKvsTreeNodeBaseObjectFunctionCall.h b/src/kvirc/kvs/tree/KviKvsTreeNodeBaseObjectFunctionCall.h
index f9580b49e..f9580b49e 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeBaseObjectFunctionCall.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeBaseObjectFunctionCall.h
diff --git a/src/kvirc/kvs/KviKvsTreeNodeCallbackCommand.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeCallbackCommand.cpp
index d46fb980d..d46fb980d 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeCallbackCommand.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeCallbackCommand.cpp
diff --git a/src/kvirc/kvs/KviKvsTreeNodeCallbackCommand.h b/src/kvirc/kvs/tree/KviKvsTreeNodeCallbackCommand.h
index 89fc230da..89fc230da 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeCallbackCommand.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeCallbackCommand.h
diff --git a/src/kvirc/kvs/KviKvsTreeNodeCommand.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeCommand.cpp
index 264149e28..264149e28 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeCommand.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeCommand.cpp
diff --git a/src/kvirc/kvs/KviKvsTreeNodeCommand.h b/src/kvirc/kvs/tree/KviKvsTreeNodeCommand.h
index 403700f07..403700f07 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeCommand.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeCommand.h
diff --git a/src/kvirc/kvs/KviKvsTreeNodeCommandEvaluation.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeCommandEvaluation.cpp
index cc97bac04..cc97bac04 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeCommandEvaluation.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeCommandEvaluation.cpp
diff --git a/src/kvirc/kvs/KviKvsTreeNodeCommandEvaluation.h b/src/kvirc/kvs/tree/KviKvsTreeNodeCommandEvaluation.h
index 18899af74..18899af74 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeCommandEvaluation.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeCommandEvaluation.h
diff --git a/src/kvirc/kvs/KviKvsTreeNodeCommandWithParameters.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeCommandWithParameters.cpp
index 3096294f3..3096294f3 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeCommandWithParameters.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeCommandWithParameters.cpp
diff --git a/src/kvirc/kvs/KviKvsTreeNodeCommandWithParameters.h b/src/kvirc/kvs/tree/KviKvsTreeNodeCommandWithParameters.h
index 94825965d..94825965d 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeCommandWithParameters.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeCommandWithParameters.h
diff --git a/src/kvirc/kvs/KviKvsTreeNodeCompositeData.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeCompositeData.cpp
index a3d1df66a..a3d1df66a 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeCompositeData.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeCompositeData.cpp
diff --git a/src/kvirc/kvs/KviKvsTreeNodeCompositeData.h b/src/kvirc/kvs/tree/KviKvsTreeNodeCompositeData.h
index 64a738fc2..64a738fc2 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeCompositeData.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeCompositeData.h
diff --git a/src/kvirc/kvs/KviKvsTreeNodeConstantData.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeConstantData.cpp
index 80c573b37..80c573b37 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeConstantData.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeConstantData.cpp
diff --git a/src/kvirc/kvs/KviKvsTreeNodeConstantData.h b/src/kvirc/kvs/tree/KviKvsTreeNodeConstantData.h
index 58d0ccc68..58d0ccc68 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeConstantData.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeConstantData.h
diff --git a/src/kvirc/kvs/KviKvsTreeNodeCoreCallbackCommand.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeCoreCallbackCommand.cpp
index e7c0bce05..e7c0bce05 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeCoreCallbackCommand.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeCoreCallbackCommand.cpp
diff --git a/src/kvirc/kvs/KviKvsTreeNodeCoreCallbackCommand.h b/src/kvirc/kvs/tree/KviKvsTreeNodeCoreCallbackCommand.h
index 2af5dc293..2af5dc293 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeCoreCallbackCommand.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeCoreCallbackCommand.h
diff --git a/src/kvirc/kvs/KviKvsTreeNodeCoreFunctionCall.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeCoreFunctionCall.cpp
index 456c3f2b7..456c3f2b7 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeCoreFunctionCall.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeCoreFunctionCall.cpp
diff --git a/src/kvirc/kvs/KviKvsTreeNodeCoreFunctionCall.h b/src/kvirc/kvs/tree/KviKvsTreeNodeCoreFunctionCall.h
index ef7e4d813..ef7e4d813 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeCoreFunctionCall.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeCoreFunctionCall.h
diff --git a/src/kvirc/kvs/KviKvsTreeNodeCoreSimpleCommand.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeCoreSimpleCommand.cpp
index f90dd27d6..f90dd27d6 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeCoreSimpleCommand.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeCoreSimpleCommand.cpp
diff --git a/src/kvirc/kvs/KviKvsTreeNodeCoreSimpleCommand.h b/src/kvirc/kvs/tree/KviKvsTreeNodeCoreSimpleCommand.h
index 973622656..973622656 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeCoreSimpleCommand.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeCoreSimpleCommand.h
diff --git a/src/kvirc/kvs/KviKvsTreeNodeData.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeData.cpp
index a9843f057..a9843f057 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeData.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeData.cpp
diff --git a/src/kvirc/kvs/KviKvsTreeNodeData.h b/src/kvirc/kvs/tree/KviKvsTreeNodeData.h
index 2b55a6406..2b55a6406 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeData.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeData.h
diff --git a/src/kvirc/kvs/KviKvsTreeNodeDataList.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeDataList.cpp
index 6ccb92ee7..6ccb92ee7 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeDataList.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeDataList.cpp
diff --git a/src/kvirc/kvs/KviKvsTreeNodeDataList.h b/src/kvirc/kvs/tree/KviKvsTreeNodeDataList.h
index 88b197a34..88b197a34 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeDataList.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeDataList.h
diff --git a/src/kvirc/kvs/KviKvsTreeNodeExpression.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeExpression.cpp
index fdf9c7df9..fdf9c7df9 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeExpression.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeExpression.cpp
diff --git a/src/kvirc/kvs/KviKvsTreeNodeExpression.h b/src/kvirc/kvs/tree/KviKvsTreeNodeExpression.h
index f7bafde21..f7bafde21 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeExpression.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeExpression.h
diff --git a/src/kvirc/kvs/KviKvsTreeNodeExpressionReturn.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeExpressionReturn.cpp
index 152ee766a..152ee766a 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeExpressionReturn.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeExpressionReturn.cpp
diff --git a/src/kvirc/kvs/KviKvsTreeNodeExpressionReturn.h b/src/kvirc/kvs/tree/KviKvsTreeNodeExpressionReturn.h
index 671322276..671322276 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeExpressionReturn.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeExpressionReturn.h
diff --git a/src/kvirc/kvs/KviKvsTreeNodeExtendedScopeVariable.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeExtendedScopeVariable.cpp
index 2f9bad7c5..2f9bad7c5 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeExtendedScopeVariable.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeExtendedScopeVariable.cpp
diff --git a/src/kvirc/kvs/KviKvsTreeNodeExtendedScopeVariable.h b/src/kvirc/kvs/tree/KviKvsTreeNodeExtendedScopeVariable.h
index a100144a5..a100144a5 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeExtendedScopeVariable.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeExtendedScopeVariable.h
diff --git a/src/kvirc/kvs/KviKvsTreeNodeFunctionCall.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeFunctionCall.cpp
index 94634a09f..94634a09f 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeFunctionCall.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeFunctionCall.cpp
diff --git a/src/kvirc/kvs/KviKvsTreeNodeFunctionCall.h b/src/kvirc/kvs/tree/KviKvsTreeNodeFunctionCall.h
index f04a655f7..f04a655f7 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeFunctionCall.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeFunctionCall.h
diff --git a/src/kvirc/kvs/KviKvsTreeNodeGlobalVariable.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeGlobalVariable.cpp
index b34ec2992..b34ec2992 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeGlobalVariable.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeGlobalVariable.cpp
diff --git a/src/kvirc/kvs/KviKvsTreeNodeGlobalVariable.h b/src/kvirc/kvs/tree/KviKvsTreeNodeGlobalVariable.h
index 54311b7b3..54311b7b3 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeGlobalVariable.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeGlobalVariable.h
diff --git a/src/kvirc/kvs/KviKvsTreeNodeHashCount.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeHashCount.cpp
index 42b076b1d..42b076b1d 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeHashCount.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeHashCount.cpp
diff --git a/src/kvirc/kvs/KviKvsTreeNodeHashCount.h b/src/kvirc/kvs/tree/KviKvsTreeNodeHashCount.h
index 42a3d35a8..42a3d35a8 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeHashCount.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeHashCount.h
diff --git a/src/kvirc/kvs/KviKvsTreeNodeHashElement.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeHashElement.cpp
index 4124837d5..4124837d5 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeHashElement.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeHashElement.cpp
diff --git a/src/kvirc/kvs/KviKvsTreeNodeHashElement.h b/src/kvirc/kvs/tree/KviKvsTreeNodeHashElement.h
index 8b414c914..8b414c914 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeHashElement.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeHashElement.h
diff --git a/src/kvirc/kvs/KviKvsTreeNodeHashReferenceAssert.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeHashReferenceAssert.cpp
index 92308056f..92308056f 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeHashReferenceAssert.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeHashReferenceAssert.cpp
diff --git a/src/kvirc/kvs/KviKvsTreeNodeHashReferenceAssert.h b/src/kvirc/kvs/tree/KviKvsTreeNodeHashReferenceAssert.h
index d76aee621..d76aee621 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeHashReferenceAssert.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeHashReferenceAssert.h
diff --git a/src/kvirc/kvs/KviKvsTreeNodeIndirectData.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeIndirectData.cpp
index b616b6d79..b616b6d79 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeIndirectData.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeIndirectData.cpp
diff --git a/src/kvirc/kvs/KviKvsTreeNodeIndirectData.h b/src/kvirc/kvs/tree/KviKvsTreeNodeIndirectData.h
index e46a06c0d..e46a06c0d 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeIndirectData.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeIndirectData.h
diff --git a/src/kvirc/kvs/KviKvsTreeNodeInstruction.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeInstruction.cpp
index 3621dc7e5..3621dc7e5 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeInstruction.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeInstruction.cpp
diff --git a/src/kvirc/kvs/KviKvsTreeNodeInstruction.h b/src/kvirc/kvs/tree/KviKvsTreeNodeInstruction.h
index af6fbb37f..af6fbb37f 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeInstruction.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeInstruction.h
diff --git a/src/kvirc/kvs/KviKvsTreeNodeInstructionBlock.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeInstructionBlock.cpp
index 40646686a..40646686a 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeInstructionBlock.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeInstructionBlock.cpp
diff --git a/src/kvirc/kvs/KviKvsTreeNodeInstructionBlock.h b/src/kvirc/kvs/tree/KviKvsTreeNodeInstructionBlock.h
index 637023f23..637023f23 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeInstructionBlock.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeInstructionBlock.h
diff --git a/src/kvirc/kvs/KviKvsTreeNodeLocalVariable.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeLocalVariable.cpp
index 61ecc9cba..61ecc9cba 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeLocalVariable.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeLocalVariable.cpp
diff --git a/src/kvirc/kvs/KviKvsTreeNodeLocalVariable.h b/src/kvirc/kvs/tree/KviKvsTreeNodeLocalVariable.h
index 8f6814e45..8f6814e45 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeLocalVariable.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeLocalVariable.h
diff --git a/src/kvirc/kvs/KviKvsTreeNodeModuleCallbackCommand.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeModuleCallbackCommand.cpp
index aeacb7e69..aeacb7e69 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeModuleCallbackCommand.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeModuleCallbackCommand.cpp
diff --git a/src/kvirc/kvs/KviKvsTreeNodeModuleCallbackCommand.h b/src/kvirc/kvs/tree/KviKvsTreeNodeModuleCallbackCommand.h
index 15e5e10df..15e5e10df 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeModuleCallbackCommand.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeModuleCallbackCommand.h
diff --git a/src/kvirc/kvs/KviKvsTreeNodeModuleFunctionCall.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeModuleFunctionCall.cpp
index 1c81bf004..1c81bf004 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeModuleFunctionCall.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeModuleFunctionCall.cpp
diff --git a/src/kvirc/kvs/KviKvsTreeNodeModuleFunctionCall.h b/src/kvirc/kvs/tree/KviKvsTreeNodeModuleFunctionCall.h
index 9867c4981..9867c4981 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeModuleFunctionCall.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeModuleFunctionCall.h
diff --git a/src/kvirc/kvs/KviKvsTreeNodeModuleSimpleCommand.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeModuleSimpleCommand.cpp
index 54a3a63af..54a3a63af 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeModuleSimpleCommand.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeModuleSimpleCommand.cpp
diff --git a/src/kvirc/kvs/KviKvsTreeNodeModuleSimpleCommand.h b/src/kvirc/kvs/tree/KviKvsTreeNodeModuleSimpleCommand.h
index 5896bf4e5..5896bf4e5 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeModuleSimpleCommand.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeModuleSimpleCommand.h
diff --git a/src/kvirc/kvs/KviKvsTreeNodeMultipleParameterIdentifier.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeMultipleParameterIdentifier.cpp
index 197db1888..197db1888 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeMultipleParameterIdentifier.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeMultipleParameterIdentifier.cpp
diff --git a/src/kvirc/kvs/KviKvsTreeNodeMultipleParameterIdentifier.h b/src/kvirc/kvs/tree/KviKvsTreeNodeMultipleParameterIdentifier.h
index 60840f86f..60840f86f 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeMultipleParameterIdentifier.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeMultipleParameterIdentifier.h
diff --git a/src/kvirc/kvs/KviKvsTreeNodeObjectField.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeObjectField.cpp
index d9e59d408..d9e59d408 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeObjectField.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeObjectField.cpp
diff --git a/src/kvirc/kvs/KviKvsTreeNodeObjectField.h b/src/kvirc/kvs/tree/KviKvsTreeNodeObjectField.h
index 6adbf7bf0..6adbf7bf0 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeObjectField.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeObjectField.h
diff --git a/src/kvirc/kvs/KviKvsTreeNodeObjectFunctionCall.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeObjectFunctionCall.cpp
index ef4047507..ef4047507 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeObjectFunctionCall.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeObjectFunctionCall.cpp
diff --git a/src/kvirc/kvs/KviKvsTreeNodeObjectFunctionCall.h b/src/kvirc/kvs/tree/KviKvsTreeNodeObjectFunctionCall.h
index b16bac392..b16bac392 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeObjectFunctionCall.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeObjectFunctionCall.h
diff --git a/src/kvirc/kvs/KviKvsTreeNodeOperation.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeOperation.cpp
index d614596a6..d614596a6 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeOperation.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeOperation.cpp
diff --git a/src/kvirc/kvs/KviKvsTreeNodeOperation.h b/src/kvirc/kvs/tree/KviKvsTreeNodeOperation.h
index a8269c353..a8269c353 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeOperation.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeOperation.h
diff --git a/src/kvirc/kvs/KviKvsTreeNodeParameterReturn.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeParameterReturn.cpp
index 2e64e5f07..2e64e5f07 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeParameterReturn.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeParameterReturn.cpp
diff --git a/src/kvirc/kvs/KviKvsTreeNodeParameterReturn.h b/src/kvirc/kvs/tree/KviKvsTreeNodeParameterReturn.h
index fe35361e6..fe35361e6 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeParameterReturn.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeParameterReturn.h
diff --git a/src/kvirc/kvs/KviKvsTreeNodeRebindingSwitch.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeRebindingSwitch.cpp
index 17e7e2861..17e7e2861 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeRebindingSwitch.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeRebindingSwitch.cpp
diff --git a/src/kvirc/kvs/KviKvsTreeNodeRebindingSwitch.h b/src/kvirc/kvs/tree/KviKvsTreeNodeRebindingSwitch.h
index 152968d33..152968d33 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeRebindingSwitch.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeRebindingSwitch.h
diff --git a/src/kvirc/kvs/KviKvsTreeNodeScopeOperator.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeScopeOperator.cpp
index 83d30c62a..83d30c62a 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeScopeOperator.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeScopeOperator.cpp
diff --git a/src/kvirc/kvs/KviKvsTreeNodeScopeOperator.h b/src/kvirc/kvs/tree/KviKvsTreeNodeScopeOperator.h
index 600d41203..600d41203 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeScopeOperator.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeScopeOperator.h
diff --git a/src/kvirc/kvs/KviKvsTreeNodeSimpleCommand.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeSimpleCommand.cpp
index 1c2ccb994..1c2ccb994 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeSimpleCommand.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSimpleCommand.cpp
diff --git a/src/kvirc/kvs/KviKvsTreeNodeSimpleCommand.h b/src/kvirc/kvs/tree/KviKvsTreeNodeSimpleCommand.h
index 7e728e4e5..7e728e4e5 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeSimpleCommand.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSimpleCommand.h
diff --git a/src/kvirc/kvs/KviKvsTreeNodeSingleParameterIdentifier.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeSingleParameterIdentifier.cpp
index 2bdc48828..2bdc48828 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeSingleParameterIdentifier.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSingleParameterIdentifier.cpp
diff --git a/src/kvirc/kvs/KviKvsTreeNodeSingleParameterIdentifier.h b/src/kvirc/kvs/tree/KviKvsTreeNodeSingleParameterIdentifier.h
index c85474419..c85474419 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeSingleParameterIdentifier.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSingleParameterIdentifier.h
diff --git a/src/kvirc/kvs/KviKvsTreeNodeSpecialCommand.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommand.cpp
index f466f8595..f466f8595 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeSpecialCommand.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommand.cpp
diff --git a/src/kvirc/kvs/KviKvsTreeNodeSpecialCommand.h b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommand.h
index adab44972..adab44972 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeSpecialCommand.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommand.h
diff --git a/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandBreak.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandBreak.cpp
index 8ee4858a7..8ee4858a7 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandBreak.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandBreak.cpp
diff --git a/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandBreak.h b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandBreak.h
index 5236722fa..5236722fa 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandBreak.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandBreak.h
diff --git a/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandClass.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandClass.cpp
index 0373dddc4..0373dddc4 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandClass.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandClass.cpp
diff --git a/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandClass.h b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandClass.h
index 4aee82c70..4aee82c70 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandClass.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandClass.h
diff --git a/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandContinue.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandContinue.cpp
index ee98e5ca4..ee98e5ca4 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandContinue.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandContinue.cpp
diff --git a/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandContinue.h b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandContinue.h
index 761fd7a6d..761fd7a6d 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandContinue.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandContinue.h
diff --git a/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandDefpopup.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandDefpopup.cpp
index c793ace80..c793ace80 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandDefpopup.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandDefpopup.cpp
diff --git a/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandDefpopup.h b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandDefpopup.h
index b8821594f..b8821594f 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandDefpopup.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandDefpopup.h
diff --git a/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandDo.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandDo.cpp
index 0d6787bae..0d6787bae 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandDo.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandDo.cpp
diff --git a/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandDo.h b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandDo.h
index 3c3220b31..3c3220b31 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandDo.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandDo.h
diff --git a/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandFor.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandFor.cpp
index 7bf6f9b26..7bf6f9b26 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandFor.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandFor.cpp
diff --git a/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandFor.h b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandFor.h
index 135c7ad61..135c7ad61 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandFor.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandFor.h
diff --git a/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandForeach.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandForeach.cpp
index 6fbd644ac..6fbd644ac 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandForeach.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandForeach.cpp
diff --git a/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandForeach.h b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandForeach.h
index 45e4d3e49..45e4d3e49 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandForeach.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandForeach.h
diff --git a/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandIf.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandIf.cpp
index 8aa6318e8..8aa6318e8 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandIf.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandIf.cpp
diff --git a/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandIf.h b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandIf.h
index f9d893b11..f9d893b11 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandIf.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandIf.h
diff --git a/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandSwitch.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandSwitch.cpp
index a0c246347..a0c246347 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandSwitch.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandSwitch.cpp
diff --git a/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandSwitch.h b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandSwitch.h
index 45dd2a09f..45dd2a09f 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandSwitch.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandSwitch.h
diff --git a/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandUnset.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandUnset.cpp
index 8899c597f..8899c597f 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandUnset.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandUnset.cpp
diff --git a/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandUnset.h b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandUnset.h
index 050893819..050893819 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandUnset.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandUnset.h
diff --git a/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandWhile.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandWhile.cpp
index 1cf83f581..1cf83f581 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandWhile.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandWhile.cpp
diff --git a/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandWhile.h b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandWhile.h
index ac616a801..ac616a801 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandWhile.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandWhile.h
diff --git a/src/kvirc/kvs/KviKvsTreeNodeStringCase.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeStringCase.cpp
index e2f0fead7..e2f0fead7 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeStringCase.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeStringCase.cpp
diff --git a/src/kvirc/kvs/KviKvsTreeNodeStringCase.h b/src/kvirc/kvs/tree/KviKvsTreeNodeStringCase.h
index 52f19bb69..52f19bb69 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeStringCase.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeStringCase.h
diff --git a/src/kvirc/kvs/KviKvsTreeNodeSwitchList.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeSwitchList.cpp
index 94d898336..94d898336 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeSwitchList.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSwitchList.cpp
diff --git a/src/kvirc/kvs/KviKvsTreeNodeSwitchList.h b/src/kvirc/kvs/tree/KviKvsTreeNodeSwitchList.h
index b37ae5f0e..b37ae5f0e 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeSwitchList.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSwitchList.h
diff --git a/src/kvirc/kvs/KviKvsTreeNodeThisObjectFunctionCall.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeThisObjectFunctionCall.cpp
index c0f122c0c..c0f122c0c 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeThisObjectFunctionCall.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeThisObjectFunctionCall.cpp
diff --git a/src/kvirc/kvs/KviKvsTreeNodeThisObjectFunctionCall.h b/src/kvirc/kvs/tree/KviKvsTreeNodeThisObjectFunctionCall.h
index 149492db9..149492db9 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeThisObjectFunctionCall.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeThisObjectFunctionCall.h
diff --git a/src/kvirc/kvs/KviKvsTreeNodeVariable.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeVariable.cpp
index f5fffdd79..f5fffdd79 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeVariable.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeVariable.cpp
diff --git a/src/kvirc/kvs/KviKvsTreeNodeVariable.h b/src/kvirc/kvs/tree/KviKvsTreeNodeVariable.h
index 3eee3ad43..3eee3ad43 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeVariable.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeVariable.h
diff --git a/src/kvirc/kvs/KviKvsTreeNodeVoidFunctionCall.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeVoidFunctionCall.cpp
index cfc20a123..cfc20a123 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeVoidFunctionCall.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeVoidFunctionCall.cpp
diff --git a/src/kvirc/kvs/KviKvsTreeNodeVoidFunctionCall.h b/src/kvirc/kvs/tree/KviKvsTreeNodeVoidFunctionCall.h
index 2f38978ad..2f38978ad 100644
--- a/src/kvirc/kvs/KviKvsTreeNodeVoidFunctionCall.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeVoidFunctionCall.h
diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt
index c74475eb5..022c244a6 100644
--- a/src/modules/CMakeLists.txt
+++ b/src/modules/CMakeLists.txt
@@ -14,6 +14,10 @@ INCLUDE_DIRECTORIES(
 	../kvilib/system/
 	../kvirc/kernel/
 	../kvirc/kvs/
+	../kvirc/kvs/event/
+	../kvirc/kvs/object/
+	../kvirc/kvs/parser/
+	../kvirc/kvs/tree/
 	../kvirc/module/
 	../kvirc/sparser/
 	../kvirc/ui/