diff --git a/CMakeBuildConfigTemplate.txt b/CMakeBuildConfigTemplate.txt
index 92a85b3d7f..5e709ca20b 100644
--- a/CMakeBuildConfigTemplate.txt
+++ b/CMakeBuildConfigTemplate.txt
@@ -131,7 +131,6 @@ AddEntityComponent(EC_TransformGizmo)
 
 ## Here are the Application level ECs that wont be added if BUILD_SDK_ONLY is TRUE (default is FALSE)
 if (NOT BUILD_SDK_ONLY)
-    AddEntityComponent(EC_Script)                   # Optional but used by both PythonScriptModule and JavascriptModule.
     AddEntityComponent(EC_PlanarMirror)
     AddEntityComponent(EC_ProximityTrigger)
     AddEntityComponent(EC_LaserPointer)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c01a9f6c80..d8b32b5559 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -435,6 +435,7 @@ macro(UseTundraCore)
     include_directories(${PROJECT_BINARY_DIR}/src/Core/TundraCore/Framework)
     include_directories(${PROJECT_BINARY_DIR}/src/Core/TundraCore/Input)
     include_directories(${PROJECT_BINARY_DIR}/src/Core/TundraCore/Scene)
+    include_directories(${PROJECT_BINARY_DIR}/src/Core/TundraCore/Script)
     include_directories(${PROJECT_BINARY_DIR}/src/Core/TundraCore/Ui)
 endmacro()
 
diff --git a/src/Application/JavascriptModule/CMakeLists.txt b/src/Application/JavascriptModule/CMakeLists.txt
index ef5da41dbe..e74f4cd1fe 100644
--- a/src/Application/JavascriptModule/CMakeLists.txt
+++ b/src/Application/JavascriptModule/CMakeLists.txt
@@ -29,7 +29,6 @@ link_package(QT4)
 link_ogre()
 link_boost()
 link_modules(TundraCore Math TundraProtocolModule)
-link_entity_components(EC_Script)
 
 SetupCompileFlagsWithPCH()
 
diff --git a/src/Core/TundraCore/CMakeLists.txt b/src/Core/TundraCore/CMakeLists.txt
index 865738a8bc..9f5b687f36 100644
--- a/src/Core/TundraCore/CMakeLists.txt
+++ b/src/Core/TundraCore/CMakeLists.txt
@@ -22,9 +22,9 @@ file(GLOB MOC_FILES
     Input/InputAPI.h Input/InputContext.h Input/KeyEvent.h Input/KeyEventSignal.h Input/MouseEvent.h
     Input/GestureEvent.h Input/EC_InputMapper.h
     Scene/SceneAPI.h Scene/Scene.h Scene/Entity.h Scene/IComponent.h Scene/EntityAction.h
-    Scene/EC_Name.h Scene/EC_DynamicComponent.h Scene/AttributeChangeType.h Scene/ChangeRequest.h
-    Scene/EC_PlaceholderComponent.h
+    Scene/AttributeChangeType.h Scene/ChangeRequest.h Scene/EC_*.h 
     Ui/UiAPI.h Ui/UiGraphicsView.h Ui/UiMainWindow.h Ui/UiProxyWidget.h Ui/QtUiAsset.h Ui/RedirectedPaintWidget.h
+    Script/EC_Script.h Script/IScriptInstance.h Script/ScriptAsset.h
 )
 
 AddSourceFolder(Asset)
@@ -33,6 +33,7 @@ AddSourceFolder(Console)
 AddSourceFolder(Framework)
 AddSourceFolder(Input)
 AddSourceFolder(Scene)
+AddSourceFolder(Script)
 AddSourceFolder(Ui)
 
 set(SOURCE_FILES ${CPP_FILES} ${H_FILES})
@@ -74,3 +75,4 @@ final_target()
 
 # Declare Windows core dependencies
 setup_install_windows_deps ("qjson.dll" Release|RelWithDebInfo|Debug)
+ 
\ No newline at end of file
diff --git a/src/EntityComponents/EC_Script/EC_Script.cpp b/src/Core/TundraCore/Script/EC_Script.cpp
similarity index 99%
rename from src/EntityComponents/EC_Script/EC_Script.cpp
rename to src/Core/TundraCore/Script/EC_Script.cpp
index 1c0e46968b..531745b1b6 100644
--- a/src/EntityComponents/EC_Script/EC_Script.cpp
+++ b/src/Core/TundraCore/Script/EC_Script.cpp
@@ -1,5 +1,6 @@
 // For conditions of distribution and use, see copyright notice in LICENSE
 
+#include "StableHeaders.h"
 #include "DebugOperatorNew.h"
 
 #include "EC_Script.h"
diff --git a/src/EntityComponents/EC_Script/EC_Script.h b/src/Core/TundraCore/Script/EC_Script.h
similarity index 100%
rename from src/EntityComponents/EC_Script/EC_Script.h
rename to src/Core/TundraCore/Script/EC_Script.h
diff --git a/src/EntityComponents/EC_Script/IScriptInstance.h b/src/Core/TundraCore/Script/IScriptInstance.h
similarity index 100%
rename from src/EntityComponents/EC_Script/IScriptInstance.h
rename to src/Core/TundraCore/Script/IScriptInstance.h
diff --git a/src/Core/TundraCore/Framework/QScriptEngineHelpers.h b/src/Core/TundraCore/Script/QScriptEngineHelpers.h
similarity index 100%
rename from src/Core/TundraCore/Framework/QScriptEngineHelpers.h
rename to src/Core/TundraCore/Script/QScriptEngineHelpers.h
diff --git a/src/EntityComponents/EC_Script/ScriptAsset.cpp b/src/Core/TundraCore/Script/ScriptAsset.cpp
similarity index 99%
rename from src/EntityComponents/EC_Script/ScriptAsset.cpp
rename to src/Core/TundraCore/Script/ScriptAsset.cpp
index 6484f40805..0fda414e71 100644
--- a/src/EntityComponents/EC_Script/ScriptAsset.cpp
+++ b/src/Core/TundraCore/Script/ScriptAsset.cpp
@@ -1,5 +1,6 @@
 // For conditions of distribution and use, see copyright notice in LICENSE
 
+#include "StableHeaders.h"
 #include "DebugOperatorNew.h"
 
 #include "ScriptAsset.h"
diff --git a/src/EntityComponents/EC_Script/ScriptAsset.h b/src/Core/TundraCore/Script/ScriptAsset.h
similarity index 100%
rename from src/EntityComponents/EC_Script/ScriptAsset.h
rename to src/Core/TundraCore/Script/ScriptAsset.h
diff --git a/src/EntityComponents/EC_Script/CMakeLists.txt b/src/EntityComponents/EC_Script/CMakeLists.txt
deleted file mode 100644
index 2372c30e46..0000000000
--- a/src/EntityComponents/EC_Script/CMakeLists.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-# Define target name and output directory
-init_target(EC_Script)
-
-# Define source files
-file(GLOB CPP_FILES *.cpp)
-file(GLOB H_FILES *.h)
-file(GLOB MOC_FILES EC_Script.h IScriptInstance.h ScriptAsset.h ScriptAssetFactory.h)
-
-# Qt4 Moc files to subgroup "CMake Moc"
-MocFolder()
-
-set(SOURCE_FILES ${CPP_FILES} ${H_FILES})
-
-# Qt4 Wrap
-QT4_WRAP_CPP(MOC_SRCS ${MOC_FILES})
-
-UseTundraCore()
-use_core_modules(TundraCore Math)
-
-build_library(${TARGET_NAME} STATIC ${SOURCE_FILES} ${MOC_SRCS})
-
-link_boost()
-link_modules(TundraCore)
-
-SetupCompileFlags()
-
-final_target()