diff --git a/doomsday/libs/core/CMakeLists.txt b/doomsday/libs/core/CMakeLists.txt
index 61e4b8879a..0c86877617 100644
--- a/doomsday/libs/core/CMakeLists.txt
+++ b/doomsday/libs/core/CMakeLists.txt
@@ -56,7 +56,7 @@ deng_merge_sources (filesys        src/filesys/*.cpp)
 deng_merge_sources (filesys_remote src/filesys/remote/*.cpp)
 deng_merge_sources (legacy         src/legacy/*.c*)
 deng_merge_sources (net            src/net/*.cpp)
-deng_merge_sources (scriptsys      src/scriptsys/*.cpp)
+deng_merge_sources (scripting      src/scripting/*.cpp)
 deng_merge_sources (term           src/term/*.cpp)
 deng_merge_sources (widgets        src/widgets/*.cpp)
 
diff --git a/doomsday/libs/core/include/de/ArrayExpression b/doomsday/libs/core/include/de/ArrayExpression
index 0dbf8eaef7..60d8ba64cc 100644
--- a/doomsday/libs/core/include/de/ArrayExpression
+++ b/doomsday/libs/core/include/de/ArrayExpression
@@ -1 +1 @@
-#include "scriptsys/arrayexpression.h"
+#include "scripting/arrayexpression.h"
diff --git a/doomsday/libs/core/include/de/AssignStatement b/doomsday/libs/core/include/de/AssignStatement
index aca8695ebc..ce8d3dcc7d 100644
--- a/doomsday/libs/core/include/de/AssignStatement
+++ b/doomsday/libs/core/include/de/AssignStatement
@@ -1 +1 @@
-#include "scriptsys/assignstatement.h"
+#include "scripting/assignstatement.h"
diff --git a/doomsday/libs/core/include/de/Binder b/doomsday/libs/core/include/de/Binder
index f6c4099f4e..334b7ce407 100644
--- a/doomsday/libs/core/include/de/Binder
+++ b/doomsday/libs/core/include/de/Binder
@@ -1 +1 @@
-#include "scriptsys/function.h"
+#include "scripting/function.h"
diff --git a/doomsday/libs/core/include/de/BuiltInExpression b/doomsday/libs/core/include/de/BuiltInExpression
index ffd3fe91ae..ec99e79317 100644
--- a/doomsday/libs/core/include/de/BuiltInExpression
+++ b/doomsday/libs/core/include/de/BuiltInExpression
@@ -1 +1 @@
-#include "scriptsys/builtinexpression.h"
+#include "scripting/builtinexpression.h"
diff --git a/doomsday/libs/core/include/de/CatchStatement b/doomsday/libs/core/include/de/CatchStatement
index 77db3360f6..77a7ec7888 100644
--- a/doomsday/libs/core/include/de/CatchStatement
+++ b/doomsday/libs/core/include/de/CatchStatement
@@ -1 +1 @@
-#include "scriptsys/catchstatement.h"
+#include "scripting/catchstatement.h"
diff --git a/doomsday/libs/core/include/de/Compound b/doomsday/libs/core/include/de/Compound
index f6327ecf66..8785697083 100644
--- a/doomsday/libs/core/include/de/Compound
+++ b/doomsday/libs/core/include/de/Compound
@@ -1 +1 @@
-#include "scriptsys/compound.h"
+#include "scripting/compound.h"
diff --git a/doomsday/libs/core/include/de/ConstantExpression b/doomsday/libs/core/include/de/ConstantExpression
index 9fe3892440..1e7db176d0 100644
--- a/doomsday/libs/core/include/de/ConstantExpression
+++ b/doomsday/libs/core/include/de/ConstantExpression
@@ -1 +1 @@
-#include "scriptsys/constantexpression.h"
+#include "scripting/constantexpression.h"
diff --git a/doomsday/libs/core/include/de/Context b/doomsday/libs/core/include/de/Context
index 15f0941f59..a3df32b97d 100644
--- a/doomsday/libs/core/include/de/Context
+++ b/doomsday/libs/core/include/de/Context
@@ -1 +1 @@
-#include "scriptsys/context.h"
+#include "scripting/context.h"
diff --git a/doomsday/libs/core/include/de/DeleteStatement b/doomsday/libs/core/include/de/DeleteStatement
index 5485fe4735..17a118e70e 100644
--- a/doomsday/libs/core/include/de/DeleteStatement
+++ b/doomsday/libs/core/include/de/DeleteStatement
@@ -1 +1 @@
-#include "scriptsys/deletestatement.h"
+#include "scripting/deletestatement.h"
diff --git a/doomsday/libs/core/include/de/DictionaryExpression b/doomsday/libs/core/include/de/DictionaryExpression
index 995ebcd5df..0fba87c4fe 100644
--- a/doomsday/libs/core/include/de/DictionaryExpression
+++ b/doomsday/libs/core/include/de/DictionaryExpression
@@ -1 +1 @@
-#include "scriptsys/dictionaryexpression.h"
+#include "scripting/dictionaryexpression.h"
diff --git a/doomsday/libs/core/include/de/Evaluator b/doomsday/libs/core/include/de/Evaluator
index 329e9271c7..9933b9f6ac 100644
--- a/doomsday/libs/core/include/de/Evaluator
+++ b/doomsday/libs/core/include/de/Evaluator
@@ -1 +1 @@
-#include "scriptsys/evaluator.h"
+#include "scripting/evaluator.h"
diff --git a/doomsday/libs/core/include/de/Expression b/doomsday/libs/core/include/de/Expression
index 82e9a9aedd..7b727881da 100644
--- a/doomsday/libs/core/include/de/Expression
+++ b/doomsday/libs/core/include/de/Expression
@@ -1 +1 @@
-#include "scriptsys/expression.h"
+#include "scripting/expression.h"
diff --git a/doomsday/libs/core/include/de/ExpressionStatement b/doomsday/libs/core/include/de/ExpressionStatement
index ff3c681703..b163f7cc60 100644
--- a/doomsday/libs/core/include/de/ExpressionStatement
+++ b/doomsday/libs/core/include/de/ExpressionStatement
@@ -1 +1 @@
-#include "scriptsys/expressionstatement.h"
+#include "scripting/expressionstatement.h"
diff --git a/doomsday/libs/core/include/de/FlowStatement b/doomsday/libs/core/include/de/FlowStatement
index eecb67fbf1..b151aa602b 100644
--- a/doomsday/libs/core/include/de/FlowStatement
+++ b/doomsday/libs/core/include/de/FlowStatement
@@ -1 +1 @@
-#include "scriptsys/flowstatement.h"
+#include "scripting/flowstatement.h"
diff --git a/doomsday/libs/core/include/de/ForStatement b/doomsday/libs/core/include/de/ForStatement
index 12b92973e7..57c2f39e11 100644
--- a/doomsday/libs/core/include/de/ForStatement
+++ b/doomsday/libs/core/include/de/ForStatement
@@ -1 +1 @@
-#include "scriptsys/forstatement.h"
+#include "scripting/forstatement.h"
diff --git a/doomsday/libs/core/include/de/Function b/doomsday/libs/core/include/de/Function
index f6c4099f4e..334b7ce407 100644
--- a/doomsday/libs/core/include/de/Function
+++ b/doomsday/libs/core/include/de/Function
@@ -1 +1 @@
-#include "scriptsys/function.h"
+#include "scripting/function.h"
diff --git a/doomsday/libs/core/include/de/FunctionStatement b/doomsday/libs/core/include/de/FunctionStatement
index 0c1230ff3e..e9873e8cb9 100644
--- a/doomsday/libs/core/include/de/FunctionStatement
+++ b/doomsday/libs/core/include/de/FunctionStatement
@@ -1 +1 @@
-#include "scriptsys/functionstatement.h"
+#include "scripting/functionstatement.h"
diff --git a/doomsday/libs/core/include/de/FunctionValue b/doomsday/libs/core/include/de/FunctionValue
index b4c6899a5f..9270411ab7 100644
--- a/doomsday/libs/core/include/de/FunctionValue
+++ b/doomsday/libs/core/include/de/FunctionValue
@@ -1 +1 @@
-#include "scriptsys/functionvalue.h"
+#include "scripting/functionvalue.h"
diff --git a/doomsday/libs/core/include/de/IObject b/doomsday/libs/core/include/de/IObject
index 9ded04f923..4c662a8af0 100644
--- a/doomsday/libs/core/include/de/IObject
+++ b/doomsday/libs/core/include/de/IObject
@@ -1 +1 @@
-#include "scriptsys/iobject.h"
+#include "scripting/iobject.h"
diff --git a/doomsday/libs/core/include/de/IParser b/doomsday/libs/core/include/de/IParser
index 13f7c7cace..acb99a2caa 100644
--- a/doomsday/libs/core/include/de/IParser
+++ b/doomsday/libs/core/include/de/IParser
@@ -1 +1 @@
-#include "scriptsys/iparser.h"
+#include "scripting/iparser.h"
diff --git a/doomsday/libs/core/include/de/IfStatement b/doomsday/libs/core/include/de/IfStatement
index 0229764410..d5f7fbfd92 100644
--- a/doomsday/libs/core/include/de/IfStatement
+++ b/doomsday/libs/core/include/de/IfStatement
@@ -1 +1 @@
-#include "scriptsys/ifstatement.h"
+#include "scripting/ifstatement.h"
diff --git a/doomsday/libs/core/include/de/Lex b/doomsday/libs/core/include/de/Lex
index 1232dba7f7..5fd1797ed4 100644
--- a/doomsday/libs/core/include/de/Lex
+++ b/doomsday/libs/core/include/de/Lex
@@ -1 +1 @@
-#include "scriptsys/lex.h"
+#include "scripting/lex.h"
diff --git a/doomsday/libs/core/include/de/Module b/doomsday/libs/core/include/de/Module
index ec4569d93b..5ad76256a0 100644
--- a/doomsday/libs/core/include/de/Module
+++ b/doomsday/libs/core/include/de/Module
@@ -1 +1 @@
-#include "scriptsys/module.h"
+#include "scripting/module.h"
diff --git a/doomsday/libs/core/include/de/NameExpression b/doomsday/libs/core/include/de/NameExpression
index cbc0670b79..94d7f74e74 100644
--- a/doomsday/libs/core/include/de/NameExpression
+++ b/doomsday/libs/core/include/de/NameExpression
@@ -1 +1 @@
-#include "scriptsys/nameexpression.h"
+#include "scripting/nameexpression.h"
diff --git a/doomsday/libs/core/include/de/Operator b/doomsday/libs/core/include/de/Operator
index 9196c4c621..d5fcdf6007 100644
--- a/doomsday/libs/core/include/de/Operator
+++ b/doomsday/libs/core/include/de/Operator
@@ -1 +1 @@
-#include "scriptsys/operator.h"
+#include "scripting/operator.h"
diff --git a/doomsday/libs/core/include/de/OperatorExpression b/doomsday/libs/core/include/de/OperatorExpression
index ab1747ba7f..a54ad4e8ba 100644
--- a/doomsday/libs/core/include/de/OperatorExpression
+++ b/doomsday/libs/core/include/de/OperatorExpression
@@ -1 +1 @@
-#include "scriptsys/operatorexpression.h"
+#include "scripting/operatorexpression.h"
diff --git a/doomsday/libs/core/include/de/Parser b/doomsday/libs/core/include/de/Parser
index 67934e1370..3b381f9c8a 100644
--- a/doomsday/libs/core/include/de/Parser
+++ b/doomsday/libs/core/include/de/Parser
@@ -1 +1 @@
-#include "scriptsys/parser.h"
+#include "scripting/parser.h"
diff --git a/doomsday/libs/core/include/de/PrintStatement b/doomsday/libs/core/include/de/PrintStatement
index 452031028a..1661f906cf 100644
--- a/doomsday/libs/core/include/de/PrintStatement
+++ b/doomsday/libs/core/include/de/PrintStatement
@@ -1 +1 @@
-#include "scriptsys/printstatement.h"
+#include "scripting/printstatement.h"
diff --git a/doomsday/libs/core/include/de/Process b/doomsday/libs/core/include/de/Process
index 47f4bfb2d3..c9da0eebe0 100644
--- a/doomsday/libs/core/include/de/Process
+++ b/doomsday/libs/core/include/de/Process
@@ -1 +1 @@
-#include "scriptsys/process.h"
+#include "scripting/process.h"
diff --git a/doomsday/libs/core/include/de/Scheduler b/doomsday/libs/core/include/de/Scheduler
index 0724970978..05c29eccc7 100644
--- a/doomsday/libs/core/include/de/Scheduler
+++ b/doomsday/libs/core/include/de/Scheduler
@@ -1 +1 @@
-#include "scriptsys/scheduler.h"
+#include "scripting/scheduler.h"
diff --git a/doomsday/libs/core/include/de/ScopeStatement b/doomsday/libs/core/include/de/ScopeStatement
index 383951d248..789b108b3c 100644
--- a/doomsday/libs/core/include/de/ScopeStatement
+++ b/doomsday/libs/core/include/de/ScopeStatement
@@ -1 +1 @@
-#include "scriptsys/scopestatement.h"
+#include "scripting/scopestatement.h"
diff --git a/doomsday/libs/core/include/de/Script b/doomsday/libs/core/include/de/Script
index 4b6f7a7720..8a7a28238e 100644
--- a/doomsday/libs/core/include/de/Script
+++ b/doomsday/libs/core/include/de/Script
@@ -1 +1 @@
-#include "scriptsys/script.h"
+#include "scripting/script.h"
diff --git a/doomsday/libs/core/include/de/ScriptLex b/doomsday/libs/core/include/de/ScriptLex
index c688e4411e..a8ad88f345 100644
--- a/doomsday/libs/core/include/de/ScriptLex
+++ b/doomsday/libs/core/include/de/ScriptLex
@@ -1 +1 @@
-#include "scriptsys/scriptlex.h"
+#include "scripting/scriptlex.h"
diff --git a/doomsday/libs/core/include/de/ScriptSystem b/doomsday/libs/core/include/de/ScriptSystem
index 87e37d12ea..eab747e781 100644
--- a/doomsday/libs/core/include/de/ScriptSystem
+++ b/doomsday/libs/core/include/de/ScriptSystem
@@ -1 +1 @@
-#include "scriptsys/scriptsystem.h"
+#include "scripting/scriptsystem.h"
diff --git a/doomsday/libs/core/include/de/ScriptedInfo b/doomsday/libs/core/include/de/ScriptedInfo
index 2dacab2715..f90704a020 100644
--- a/doomsday/libs/core/include/de/ScriptedInfo
+++ b/doomsday/libs/core/include/de/ScriptedInfo
@@ -1 +1 @@
-#include "scriptsys/scriptedinfo.h"
+#include "scripting/scriptedinfo.h"
diff --git a/doomsday/libs/core/include/de/Statement b/doomsday/libs/core/include/de/Statement
index a18afcae60..eda32cf596 100644
--- a/doomsday/libs/core/include/de/Statement
+++ b/doomsday/libs/core/include/de/Statement
@@ -1 +1 @@
-#include "scriptsys/statement.h"
+#include "scripting/statement.h"
diff --git a/doomsday/libs/core/include/de/Timeline b/doomsday/libs/core/include/de/Timeline
index a5f2cb9051..b137f285ac 100644
--- a/doomsday/libs/core/include/de/Timeline
+++ b/doomsday/libs/core/include/de/Timeline
@@ -1 +1 @@
-#include "scriptsys/timeline.h"
+#include "scripting/timeline.h"
diff --git a/doomsday/libs/core/include/de/TokenBuffer b/doomsday/libs/core/include/de/TokenBuffer
index 2355a89d99..637bacc747 100644
--- a/doomsday/libs/core/include/de/TokenBuffer
+++ b/doomsday/libs/core/include/de/TokenBuffer
@@ -1 +1 @@
-#include "scriptsys/tokenbuffer.h"
+#include "scripting/tokenbuffer.h"
diff --git a/doomsday/libs/core/include/de/TokenRange b/doomsday/libs/core/include/de/TokenRange
index 111acb0e9b..0e43f6c06e 100644
--- a/doomsday/libs/core/include/de/TokenRange
+++ b/doomsday/libs/core/include/de/TokenRange
@@ -1 +1 @@
-#include "scriptsys/tokenrange.h"
+#include "scripting/tokenrange.h"
diff --git a/doomsday/libs/core/include/de/TryStatement b/doomsday/libs/core/include/de/TryStatement
index 0181e7325c..929cd8f8bb 100644
--- a/doomsday/libs/core/include/de/TryStatement
+++ b/doomsday/libs/core/include/de/TryStatement
@@ -1 +1 @@
-#include "scriptsys/trystatement.h"
+#include "scripting/trystatement.h"
diff --git a/doomsday/libs/core/include/de/WhileStatement b/doomsday/libs/core/include/de/WhileStatement
index 843e61fc9f..80a0cdb096 100644
--- a/doomsday/libs/core/include/de/WhileStatement
+++ b/doomsday/libs/core/include/de/WhileStatement
@@ -1 +1 @@
-#include "scriptsys/whilestatement.h"
+#include "scripting/whilestatement.h"
diff --git a/doomsday/libs/core/include/de/scriptsys/arrayexpression.h b/doomsday/libs/core/include/de/scripting/arrayexpression.h
similarity index 100%
rename from doomsday/libs/core/include/de/scriptsys/arrayexpression.h
rename to doomsday/libs/core/include/de/scripting/arrayexpression.h
diff --git a/doomsday/libs/core/include/de/scriptsys/assignstatement.h b/doomsday/libs/core/include/de/scripting/assignstatement.h
similarity index 100%
rename from doomsday/libs/core/include/de/scriptsys/assignstatement.h
rename to doomsday/libs/core/include/de/scripting/assignstatement.h
diff --git a/doomsday/libs/core/include/de/scriptsys/builtinexpression.h b/doomsday/libs/core/include/de/scripting/builtinexpression.h
similarity index 100%
rename from doomsday/libs/core/include/de/scriptsys/builtinexpression.h
rename to doomsday/libs/core/include/de/scripting/builtinexpression.h
diff --git a/doomsday/libs/core/include/de/scriptsys/catchstatement.h b/doomsday/libs/core/include/de/scripting/catchstatement.h
similarity index 100%
rename from doomsday/libs/core/include/de/scriptsys/catchstatement.h
rename to doomsday/libs/core/include/de/scripting/catchstatement.h
diff --git a/doomsday/libs/core/include/de/scriptsys/compound.h b/doomsday/libs/core/include/de/scripting/compound.h
similarity index 100%
rename from doomsday/libs/core/include/de/scriptsys/compound.h
rename to doomsday/libs/core/include/de/scripting/compound.h
diff --git a/doomsday/libs/core/include/de/scriptsys/constantexpression.h b/doomsday/libs/core/include/de/scripting/constantexpression.h
similarity index 100%
rename from doomsday/libs/core/include/de/scriptsys/constantexpression.h
rename to doomsday/libs/core/include/de/scripting/constantexpression.h
diff --git a/doomsday/libs/core/include/de/scriptsys/context.h b/doomsday/libs/core/include/de/scripting/context.h
similarity index 100%
rename from doomsday/libs/core/include/de/scriptsys/context.h
rename to doomsday/libs/core/include/de/scripting/context.h
diff --git a/doomsday/libs/core/include/de/scriptsys/deletestatement.h b/doomsday/libs/core/include/de/scripting/deletestatement.h
similarity index 100%
rename from doomsday/libs/core/include/de/scriptsys/deletestatement.h
rename to doomsday/libs/core/include/de/scripting/deletestatement.h
diff --git a/doomsday/libs/core/include/de/scriptsys/dictionaryexpression.h b/doomsday/libs/core/include/de/scripting/dictionaryexpression.h
similarity index 100%
rename from doomsday/libs/core/include/de/scriptsys/dictionaryexpression.h
rename to doomsday/libs/core/include/de/scripting/dictionaryexpression.h
diff --git a/doomsday/libs/core/include/de/scriptsys/evaluator.h b/doomsday/libs/core/include/de/scripting/evaluator.h
similarity index 100%
rename from doomsday/libs/core/include/de/scriptsys/evaluator.h
rename to doomsday/libs/core/include/de/scripting/evaluator.h
diff --git a/doomsday/libs/core/include/de/scriptsys/expression.h b/doomsday/libs/core/include/de/scripting/expression.h
similarity index 100%
rename from doomsday/libs/core/include/de/scriptsys/expression.h
rename to doomsday/libs/core/include/de/scripting/expression.h
diff --git a/doomsday/libs/core/include/de/scriptsys/expressionstatement.h b/doomsday/libs/core/include/de/scripting/expressionstatement.h
similarity index 100%
rename from doomsday/libs/core/include/de/scriptsys/expressionstatement.h
rename to doomsday/libs/core/include/de/scripting/expressionstatement.h
diff --git a/doomsday/libs/core/include/de/scriptsys/flowstatement.h b/doomsday/libs/core/include/de/scripting/flowstatement.h
similarity index 100%
rename from doomsday/libs/core/include/de/scriptsys/flowstatement.h
rename to doomsday/libs/core/include/de/scripting/flowstatement.h
diff --git a/doomsday/libs/core/include/de/scriptsys/forstatement.h b/doomsday/libs/core/include/de/scripting/forstatement.h
similarity index 100%
rename from doomsday/libs/core/include/de/scriptsys/forstatement.h
rename to doomsday/libs/core/include/de/scripting/forstatement.h
diff --git a/doomsday/libs/core/include/de/scriptsys/function.h b/doomsday/libs/core/include/de/scripting/function.h
similarity index 100%
rename from doomsday/libs/core/include/de/scriptsys/function.h
rename to doomsday/libs/core/include/de/scripting/function.h
diff --git a/doomsday/libs/core/include/de/scriptsys/functionstatement.h b/doomsday/libs/core/include/de/scripting/functionstatement.h
similarity index 100%
rename from doomsday/libs/core/include/de/scriptsys/functionstatement.h
rename to doomsday/libs/core/include/de/scripting/functionstatement.h
diff --git a/doomsday/libs/core/include/de/scriptsys/functionvalue.h b/doomsday/libs/core/include/de/scripting/functionvalue.h
similarity index 100%
rename from doomsday/libs/core/include/de/scriptsys/functionvalue.h
rename to doomsday/libs/core/include/de/scripting/functionvalue.h
diff --git a/doomsday/libs/core/include/de/scriptsys/ifstatement.h b/doomsday/libs/core/include/de/scripting/ifstatement.h
similarity index 100%
rename from doomsday/libs/core/include/de/scriptsys/ifstatement.h
rename to doomsday/libs/core/include/de/scripting/ifstatement.h
diff --git a/doomsday/libs/core/include/de/scriptsys/iobject.h b/doomsday/libs/core/include/de/scripting/iobject.h
similarity index 100%
rename from doomsday/libs/core/include/de/scriptsys/iobject.h
rename to doomsday/libs/core/include/de/scripting/iobject.h
diff --git a/doomsday/libs/core/include/de/scriptsys/iparser.h b/doomsday/libs/core/include/de/scripting/iparser.h
similarity index 100%
rename from doomsday/libs/core/include/de/scriptsys/iparser.h
rename to doomsday/libs/core/include/de/scripting/iparser.h
diff --git a/doomsday/libs/core/include/de/scriptsys/lex.h b/doomsday/libs/core/include/de/scripting/lex.h
similarity index 100%
rename from doomsday/libs/core/include/de/scriptsys/lex.h
rename to doomsday/libs/core/include/de/scripting/lex.h
diff --git a/doomsday/libs/core/include/de/scriptsys/module.h b/doomsday/libs/core/include/de/scripting/module.h
similarity index 100%
rename from doomsday/libs/core/include/de/scriptsys/module.h
rename to doomsday/libs/core/include/de/scripting/module.h
diff --git a/doomsday/libs/core/include/de/scriptsys/nameexpression.h b/doomsday/libs/core/include/de/scripting/nameexpression.h
similarity index 100%
rename from doomsday/libs/core/include/de/scriptsys/nameexpression.h
rename to doomsday/libs/core/include/de/scripting/nameexpression.h
diff --git a/doomsday/libs/core/include/de/scriptsys/operator.h b/doomsday/libs/core/include/de/scripting/operator.h
similarity index 100%
rename from doomsday/libs/core/include/de/scriptsys/operator.h
rename to doomsday/libs/core/include/de/scripting/operator.h
diff --git a/doomsday/libs/core/include/de/scriptsys/operatorexpression.h b/doomsday/libs/core/include/de/scripting/operatorexpression.h
similarity index 100%
rename from doomsday/libs/core/include/de/scriptsys/operatorexpression.h
rename to doomsday/libs/core/include/de/scripting/operatorexpression.h
diff --git a/doomsday/libs/core/include/de/scriptsys/parser.h b/doomsday/libs/core/include/de/scripting/parser.h
similarity index 100%
rename from doomsday/libs/core/include/de/scriptsys/parser.h
rename to doomsday/libs/core/include/de/scripting/parser.h
diff --git a/doomsday/libs/core/include/de/scriptsys/printstatement.h b/doomsday/libs/core/include/de/scripting/printstatement.h
similarity index 100%
rename from doomsday/libs/core/include/de/scriptsys/printstatement.h
rename to doomsday/libs/core/include/de/scripting/printstatement.h
diff --git a/doomsday/libs/core/include/de/scriptsys/process.h b/doomsday/libs/core/include/de/scripting/process.h
similarity index 100%
rename from doomsday/libs/core/include/de/scriptsys/process.h
rename to doomsday/libs/core/include/de/scripting/process.h
diff --git a/doomsday/libs/core/include/de/scriptsys/scheduler.h b/doomsday/libs/core/include/de/scripting/scheduler.h
similarity index 100%
rename from doomsday/libs/core/include/de/scriptsys/scheduler.h
rename to doomsday/libs/core/include/de/scripting/scheduler.h
diff --git a/doomsday/libs/core/include/de/scriptsys/scopestatement.h b/doomsday/libs/core/include/de/scripting/scopestatement.h
similarity index 100%
rename from doomsday/libs/core/include/de/scriptsys/scopestatement.h
rename to doomsday/libs/core/include/de/scripting/scopestatement.h
diff --git a/doomsday/libs/core/include/de/scriptsys/script.h b/doomsday/libs/core/include/de/scripting/script.h
similarity index 100%
rename from doomsday/libs/core/include/de/scriptsys/script.h
rename to doomsday/libs/core/include/de/scripting/script.h
diff --git a/doomsday/libs/core/include/de/scriptsys/scriptedinfo.h b/doomsday/libs/core/include/de/scripting/scriptedinfo.h
similarity index 100%
rename from doomsday/libs/core/include/de/scriptsys/scriptedinfo.h
rename to doomsday/libs/core/include/de/scripting/scriptedinfo.h
diff --git a/doomsday/libs/core/include/de/scriptsys/scriptlex.h b/doomsday/libs/core/include/de/scripting/scriptlex.h
similarity index 100%
rename from doomsday/libs/core/include/de/scriptsys/scriptlex.h
rename to doomsday/libs/core/include/de/scripting/scriptlex.h
diff --git a/doomsday/libs/core/include/de/scriptsys/scriptsystem.h b/doomsday/libs/core/include/de/scripting/scriptsystem.h
similarity index 100%
rename from doomsday/libs/core/include/de/scriptsys/scriptsystem.h
rename to doomsday/libs/core/include/de/scripting/scriptsystem.h
diff --git a/doomsday/libs/core/include/de/scriptsys/statement.h b/doomsday/libs/core/include/de/scripting/statement.h
similarity index 100%
rename from doomsday/libs/core/include/de/scriptsys/statement.h
rename to doomsday/libs/core/include/de/scripting/statement.h
diff --git a/doomsday/libs/core/include/de/scriptsys/timeline.h b/doomsday/libs/core/include/de/scripting/timeline.h
similarity index 100%
rename from doomsday/libs/core/include/de/scriptsys/timeline.h
rename to doomsday/libs/core/include/de/scripting/timeline.h
diff --git a/doomsday/libs/core/include/de/scriptsys/tokenbuffer.h b/doomsday/libs/core/include/de/scripting/tokenbuffer.h
similarity index 100%
rename from doomsday/libs/core/include/de/scriptsys/tokenbuffer.h
rename to doomsday/libs/core/include/de/scripting/tokenbuffer.h
diff --git a/doomsday/libs/core/include/de/scriptsys/tokenrange.h b/doomsday/libs/core/include/de/scripting/tokenrange.h
similarity index 100%
rename from doomsday/libs/core/include/de/scriptsys/tokenrange.h
rename to doomsday/libs/core/include/de/scripting/tokenrange.h
diff --git a/doomsday/libs/core/include/de/scriptsys/trystatement.h b/doomsday/libs/core/include/de/scripting/trystatement.h
similarity index 100%
rename from doomsday/libs/core/include/de/scriptsys/trystatement.h
rename to doomsday/libs/core/include/de/scripting/trystatement.h
diff --git a/doomsday/libs/core/include/de/scriptsys/whilestatement.h b/doomsday/libs/core/include/de/scripting/whilestatement.h
similarity index 100%
rename from doomsday/libs/core/include/de/scriptsys/whilestatement.h
rename to doomsday/libs/core/include/de/scripting/whilestatement.h
diff --git a/doomsday/libs/core/src/scriptsys/arrayexpression.cpp b/doomsday/libs/core/src/scripting/arrayexpression.cpp
similarity index 100%
rename from doomsday/libs/core/src/scriptsys/arrayexpression.cpp
rename to doomsday/libs/core/src/scripting/arrayexpression.cpp
diff --git a/doomsday/libs/core/src/scriptsys/assignstatement.cpp b/doomsday/libs/core/src/scripting/assignstatement.cpp
similarity index 100%
rename from doomsday/libs/core/src/scriptsys/assignstatement.cpp
rename to doomsday/libs/core/src/scripting/assignstatement.cpp
diff --git a/doomsday/libs/core/src/scriptsys/bindings_core.cpp b/doomsday/libs/core/src/scripting/bindings_core.cpp
similarity index 100%
rename from doomsday/libs/core/src/scriptsys/bindings_core.cpp
rename to doomsday/libs/core/src/scripting/bindings_core.cpp
diff --git a/doomsday/libs/core/src/scriptsys/bindings_core.h b/doomsday/libs/core/src/scripting/bindings_core.h
similarity index 100%
rename from doomsday/libs/core/src/scriptsys/bindings_core.h
rename to doomsday/libs/core/src/scripting/bindings_core.h
diff --git a/doomsday/libs/core/src/scriptsys/bindings_math.cpp b/doomsday/libs/core/src/scripting/bindings_math.cpp
similarity index 97%
rename from doomsday/libs/core/src/scriptsys/bindings_math.cpp
rename to doomsday/libs/core/src/scripting/bindings_math.cpp
index 1931d3691b..b3f5d48082 100644
--- a/doomsday/libs/core/src/scriptsys/bindings_math.cpp
+++ b/doomsday/libs/core/src/scripting/bindings_math.cpp
@@ -16,7 +16,7 @@
  * http://www.gnu.org/licenses</small>
  */
 
-#include "../src/scriptsys/bindings_math.h"
+#include "../src/scripting/bindings_math.h"
 #include "de/math.h"
 
 #include <de/NumberValue>
diff --git a/doomsday/libs/core/src/scriptsys/bindings_math.h b/doomsday/libs/core/src/scripting/bindings_math.h
similarity index 100%
rename from doomsday/libs/core/src/scriptsys/bindings_math.h
rename to doomsday/libs/core/src/scripting/bindings_math.h
diff --git a/doomsday/libs/core/src/scriptsys/builtinexpression.cpp b/doomsday/libs/core/src/scripting/builtinexpression.cpp
similarity index 100%
rename from doomsday/libs/core/src/scriptsys/builtinexpression.cpp
rename to doomsday/libs/core/src/scripting/builtinexpression.cpp
diff --git a/doomsday/libs/core/src/scriptsys/catchstatement.cpp b/doomsday/libs/core/src/scripting/catchstatement.cpp
similarity index 100%
rename from doomsday/libs/core/src/scriptsys/catchstatement.cpp
rename to doomsday/libs/core/src/scripting/catchstatement.cpp
diff --git a/doomsday/libs/core/src/scriptsys/compound.cpp b/doomsday/libs/core/src/scripting/compound.cpp
similarity index 100%
rename from doomsday/libs/core/src/scriptsys/compound.cpp
rename to doomsday/libs/core/src/scripting/compound.cpp
diff --git a/doomsday/libs/core/src/scriptsys/constantexpression.cpp b/doomsday/libs/core/src/scripting/constantexpression.cpp
similarity index 100%
rename from doomsday/libs/core/src/scriptsys/constantexpression.cpp
rename to doomsday/libs/core/src/scripting/constantexpression.cpp
diff --git a/doomsday/libs/core/src/scriptsys/context.cpp b/doomsday/libs/core/src/scripting/context.cpp
similarity index 100%
rename from doomsday/libs/core/src/scriptsys/context.cpp
rename to doomsday/libs/core/src/scripting/context.cpp
diff --git a/doomsday/libs/core/src/scriptsys/deletestatement.cpp b/doomsday/libs/core/src/scripting/deletestatement.cpp
similarity index 100%
rename from doomsday/libs/core/src/scriptsys/deletestatement.cpp
rename to doomsday/libs/core/src/scripting/deletestatement.cpp
diff --git a/doomsday/libs/core/src/scriptsys/dictionaryexpression.cpp b/doomsday/libs/core/src/scripting/dictionaryexpression.cpp
similarity index 100%
rename from doomsday/libs/core/src/scriptsys/dictionaryexpression.cpp
rename to doomsday/libs/core/src/scripting/dictionaryexpression.cpp
diff --git a/doomsday/libs/core/src/scriptsys/evaluator.cpp b/doomsday/libs/core/src/scripting/evaluator.cpp
similarity index 100%
rename from doomsday/libs/core/src/scriptsys/evaluator.cpp
rename to doomsday/libs/core/src/scripting/evaluator.cpp
diff --git a/doomsday/libs/core/src/scriptsys/expression.cpp b/doomsday/libs/core/src/scripting/expression.cpp
similarity index 100%
rename from doomsday/libs/core/src/scriptsys/expression.cpp
rename to doomsday/libs/core/src/scripting/expression.cpp
diff --git a/doomsday/libs/core/src/scriptsys/expressionstatement.cpp b/doomsday/libs/core/src/scripting/expressionstatement.cpp
similarity index 100%
rename from doomsday/libs/core/src/scriptsys/expressionstatement.cpp
rename to doomsday/libs/core/src/scripting/expressionstatement.cpp
diff --git a/doomsday/libs/core/src/scriptsys/flowstatement.cpp b/doomsday/libs/core/src/scripting/flowstatement.cpp
similarity index 100%
rename from doomsday/libs/core/src/scriptsys/flowstatement.cpp
rename to doomsday/libs/core/src/scripting/flowstatement.cpp
diff --git a/doomsday/libs/core/src/scriptsys/forstatement.cpp b/doomsday/libs/core/src/scripting/forstatement.cpp
similarity index 100%
rename from doomsday/libs/core/src/scriptsys/forstatement.cpp
rename to doomsday/libs/core/src/scripting/forstatement.cpp
diff --git a/doomsday/libs/core/src/scriptsys/function.cpp b/doomsday/libs/core/src/scripting/function.cpp
similarity index 100%
rename from doomsday/libs/core/src/scriptsys/function.cpp
rename to doomsday/libs/core/src/scripting/function.cpp
diff --git a/doomsday/libs/core/src/scriptsys/functionstatement.cpp b/doomsday/libs/core/src/scripting/functionstatement.cpp
similarity index 100%
rename from doomsday/libs/core/src/scriptsys/functionstatement.cpp
rename to doomsday/libs/core/src/scripting/functionstatement.cpp
diff --git a/doomsday/libs/core/src/scriptsys/functionvalue.cpp b/doomsday/libs/core/src/scripting/functionvalue.cpp
similarity index 100%
rename from doomsday/libs/core/src/scriptsys/functionvalue.cpp
rename to doomsday/libs/core/src/scripting/functionvalue.cpp
diff --git a/doomsday/libs/core/src/scriptsys/ifstatement.cpp b/doomsday/libs/core/src/scripting/ifstatement.cpp
similarity index 100%
rename from doomsday/libs/core/src/scriptsys/ifstatement.cpp
rename to doomsday/libs/core/src/scripting/ifstatement.cpp
diff --git a/doomsday/libs/core/src/scriptsys/lex.cpp b/doomsday/libs/core/src/scripting/lex.cpp
similarity index 100%
rename from doomsday/libs/core/src/scriptsys/lex.cpp
rename to doomsday/libs/core/src/scripting/lex.cpp
diff --git a/doomsday/libs/core/src/scriptsys/module.cpp b/doomsday/libs/core/src/scripting/module.cpp
similarity index 100%
rename from doomsday/libs/core/src/scriptsys/module.cpp
rename to doomsday/libs/core/src/scripting/module.cpp
diff --git a/doomsday/libs/core/src/scriptsys/nameexpression.cpp b/doomsday/libs/core/src/scripting/nameexpression.cpp
similarity index 100%
rename from doomsday/libs/core/src/scriptsys/nameexpression.cpp
rename to doomsday/libs/core/src/scripting/nameexpression.cpp
diff --git a/doomsday/libs/core/src/scriptsys/operator.cpp b/doomsday/libs/core/src/scripting/operator.cpp
similarity index 100%
rename from doomsday/libs/core/src/scriptsys/operator.cpp
rename to doomsday/libs/core/src/scripting/operator.cpp
diff --git a/doomsday/libs/core/src/scriptsys/operatorexpression.cpp b/doomsday/libs/core/src/scripting/operatorexpression.cpp
similarity index 100%
rename from doomsday/libs/core/src/scriptsys/operatorexpression.cpp
rename to doomsday/libs/core/src/scripting/operatorexpression.cpp
diff --git a/doomsday/libs/core/src/scriptsys/parser.cpp b/doomsday/libs/core/src/scripting/parser.cpp
similarity index 100%
rename from doomsday/libs/core/src/scriptsys/parser.cpp
rename to doomsday/libs/core/src/scripting/parser.cpp
diff --git a/doomsday/libs/core/src/scriptsys/printstatement.cpp b/doomsday/libs/core/src/scripting/printstatement.cpp
similarity index 100%
rename from doomsday/libs/core/src/scriptsys/printstatement.cpp
rename to doomsday/libs/core/src/scripting/printstatement.cpp
diff --git a/doomsday/libs/core/src/scriptsys/process.cpp b/doomsday/libs/core/src/scripting/process.cpp
similarity index 100%
rename from doomsday/libs/core/src/scriptsys/process.cpp
rename to doomsday/libs/core/src/scripting/process.cpp
diff --git a/doomsday/libs/core/src/scriptsys/scheduler.cpp b/doomsday/libs/core/src/scripting/scheduler.cpp
similarity index 100%
rename from doomsday/libs/core/src/scriptsys/scheduler.cpp
rename to doomsday/libs/core/src/scripting/scheduler.cpp
diff --git a/doomsday/libs/core/src/scriptsys/scopestatement.cpp b/doomsday/libs/core/src/scripting/scopestatement.cpp
similarity index 100%
rename from doomsday/libs/core/src/scriptsys/scopestatement.cpp
rename to doomsday/libs/core/src/scripting/scopestatement.cpp
diff --git a/doomsday/libs/core/src/scriptsys/script.cpp b/doomsday/libs/core/src/scripting/script.cpp
similarity index 100%
rename from doomsday/libs/core/src/scriptsys/script.cpp
rename to doomsday/libs/core/src/scripting/script.cpp
diff --git a/doomsday/libs/core/src/scriptsys/scriptedinfo.cpp b/doomsday/libs/core/src/scripting/scriptedinfo.cpp
similarity index 100%
rename from doomsday/libs/core/src/scriptsys/scriptedinfo.cpp
rename to doomsday/libs/core/src/scripting/scriptedinfo.cpp
diff --git a/doomsday/libs/core/src/scriptsys/scriptlex.cpp b/doomsday/libs/core/src/scripting/scriptlex.cpp
similarity index 100%
rename from doomsday/libs/core/src/scriptsys/scriptlex.cpp
rename to doomsday/libs/core/src/scripting/scriptlex.cpp
diff --git a/doomsday/libs/core/src/scriptsys/scriptsystem.cpp b/doomsday/libs/core/src/scripting/scriptsystem.cpp
similarity index 99%
rename from doomsday/libs/core/src/scriptsys/scriptsystem.cpp
rename to doomsday/libs/core/src/scripting/scriptsystem.cpp
index fec7cb0ccc..3aa15ead1a 100644
--- a/doomsday/libs/core/src/scriptsys/scriptsystem.cpp
+++ b/doomsday/libs/core/src/scripting/scriptsystem.cpp
@@ -32,8 +32,8 @@
 #include "de/Version"
 #include "de/math.h"
 
-#include "../src/scriptsys/bindings_core.h"
-#include "../src/scriptsys/bindings_math.h"
+#include "../src/scripting/bindings_core.h"
+#include "../src/scripting/bindings_math.h"
 
 namespace de {
 
diff --git a/doomsday/libs/core/src/scriptsys/statement.cpp b/doomsday/libs/core/src/scripting/statement.cpp
similarity index 100%
rename from doomsday/libs/core/src/scriptsys/statement.cpp
rename to doomsday/libs/core/src/scripting/statement.cpp
diff --git a/doomsday/libs/core/src/scriptsys/timeline.cpp b/doomsday/libs/core/src/scripting/timeline.cpp
similarity index 100%
rename from doomsday/libs/core/src/scriptsys/timeline.cpp
rename to doomsday/libs/core/src/scripting/timeline.cpp
diff --git a/doomsday/libs/core/src/scriptsys/tokenbuffer.cpp b/doomsday/libs/core/src/scripting/tokenbuffer.cpp
similarity index 100%
rename from doomsday/libs/core/src/scriptsys/tokenbuffer.cpp
rename to doomsday/libs/core/src/scripting/tokenbuffer.cpp
diff --git a/doomsday/libs/core/src/scriptsys/tokenrange.cpp b/doomsday/libs/core/src/scripting/tokenrange.cpp
similarity index 100%
rename from doomsday/libs/core/src/scriptsys/tokenrange.cpp
rename to doomsday/libs/core/src/scripting/tokenrange.cpp
diff --git a/doomsday/libs/core/src/scriptsys/trystatement.cpp b/doomsday/libs/core/src/scripting/trystatement.cpp
similarity index 100%
rename from doomsday/libs/core/src/scriptsys/trystatement.cpp
rename to doomsday/libs/core/src/scripting/trystatement.cpp
diff --git a/doomsday/libs/core/src/scriptsys/whilestatement.cpp b/doomsday/libs/core/src/scripting/whilestatement.cpp
similarity index 100%
rename from doomsday/libs/core/src/scriptsys/whilestatement.cpp
rename to doomsday/libs/core/src/scripting/whilestatement.cpp