Reorganized core/ directory, it was too fatty already

-Removed FuncRef, since Callable makes it obsolete
-Removed int_types.h as its obsolete in c++11+
-Changed color names code

3 files changed, 4 insertions, 4 deletions

diff --git a/platform/javascript/api/api.cpp b/platform/javascript/api/api.cpp
index aa0206d144..6fd6c0ddf1 100644
--- a/platform/javascript/api/api.cpp
+++ b/platform/javascript/api/api.cpp
@@ -29,7 +29,7 @@
 /*************************************************************************/
 
 #include "api.h"
-#include "core/engine.h"
+#include "core/config/engine.h"
 #include "javascript_eval.h"
 #include "javascript_tools_editor_plugin.h"
 
diff --git a/platform/javascript/api/javascript_eval.h b/platform/javascript/api/javascript_eval.h
index 26b5b9e484..389983077e 100644
--- a/platform/javascript/api/javascript_eval.h
+++ b/platform/javascript/api/javascript_eval.h
@@ -31,7 +31,7 @@
 #ifndef JAVASCRIPT_EVAL_H
 #define JAVASCRIPT_EVAL_H
 
-#include "core/class_db.h"
+#include "core/object/class_db.h"
 
 class JavaScript : public Object {
 private:
diff --git a/platform/javascript/api/javascript_tools_editor_plugin.cpp b/platform/javascript/api/javascript_tools_editor_plugin.cpp
index e487bf23b7..d44e8139a1 100644
--- a/platform/javascript/api/javascript_tools_editor_plugin.cpp
+++ b/platform/javascript/api/javascript_tools_editor_plugin.cpp
@@ -31,10 +31,10 @@
 #if defined(TOOLS_ENABLED) && defined(JAVASCRIPT_ENABLED)
 #include "javascript_tools_editor_plugin.h"
 
-#include "core/engine.h"
+#include "core/config/engine.h"
+#include "core/config/project_settings.h"
 #include "core/os/dir_access.h"
 #include "core/os/file_access.h"
-#include "core/project_settings.h"
 #include "editor/editor_node.h"
 
 #include <emscripten/emscripten.h>