diff --git a/tools/editor/editor_autoload_settings.cpp b/tools/editor/editor_autoload_settings.cpp
new file mode 100644
index 00000000000..1cf0090e7e5
--- /dev/null
+++ b/tools/editor/editor_autoload_settings.cpp
@@ -0,0 +1,618 @@
+/*************************************************************************/
+/*  editor_autoload_settings.cpp                                         */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                    http://www.godotengine.org                         */
+/*************************************************************************/
+/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur.                 */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#include "editor_autoload_settings.h"
+
+#include "globals.h"
+#include "global_constants.h"
+
+#include "editor_node.h"
+
+#define PREVIEW_LIST_MAX_SIZE 10
+
+StringName EditorAutoloadSettings::autoload_changed = StringName();
+
+void EditorAutoloadSettings::_notification(int p_what) {
+
+	if (p_what == NOTIFICATION_ENTER_TREE) {
+
+		List<String> afn;
+		ResourceLoader::get_recognized_extensions_for_type("Script", &afn);
+		ResourceLoader::get_recognized_extensions_for_type("PackedScene", &afn);
+
+		EditorFileDialog *file_dialog = autoload_add_path->get_file_dialog();
+
+		for (List<String>::Element *E = afn.front(); E; E = E->next()) {
+
+			file_dialog->add_filter("*." + E->get());
+		}
+	}
+}
+
+bool EditorAutoloadSettings::_autoload_name_is_valid(const String& p_name, String* r_error) {
+
+	if (!p_name.is_valid_identifier()) {
+		if (r_error)
+			*r_error = TTR("Invalid name.") + "\n" + TTR("Valid characters:")+" a-z, A-Z, 0-9 or _";
+
+		return false;
+	}
+
+	if (ObjectTypeDB::type_exists(p_name)) {
+		if (r_error)
+			*r_error = TTR("Invalid name. Must not collide with an existing engine class name.");
+
+		return false;
+	}
+
+	for (int i = 0; i < Variant::VARIANT_MAX; i++) {
+		if (Variant::get_type_name( Variant::Type(i) ) == p_name) {
+			if (r_error)
+				*r_error = TTR("Invalid name. Must not collide with an existing buit-in type name.");
+
+			return false;
+		}
+	}
+
+	for (int i = 0; i < GlobalConstants::get_global_constant_count(); i++) {
+		if (GlobalConstants::get_global_constant_name(i) == p_name) {
+			if (r_error)
+				*r_error = TTR("Invalid name. Must not collide with an existing global constant name.");
+
+			return false;
+		}
+	}
+
+	return true;
+}
+
+void EditorAutoloadSettings::_autoload_add() {
+
+	String name = autoload_add_name->get_text();
+
+	String error;
+	if (!_autoload_name_is_valid(name, &error)) {
+		EditorNode::get_singleton()->show_warning(error);
+		return;
+	}
+
+	String path = autoload_add_path->get_line_edit()->get_text();
+	if (!FileAccess::exists(path)) {
+		EditorNode::get_singleton()->show_warning(TTR("Invalid Path.") + "\n" + TTR("File does not exist."));
+		return;
+	}
+
+	if (!path.begins_with("res://")) {
+		EditorNode::get_singleton()->show_warning(TTR("Invalid Path.") + "\n"+ TTR("Not in resource path."));
+		return;
+	}
+
+	name = "autoload/" + name;
+
+	UndoRedo* undo_redo = EditorNode::get_singleton()->get_undo_redo();
+
+	undo_redo->create_action(TTR("Add AutoLoad"));
+	undo_redo->add_do_property(Globals::get_singleton(), name, "*" + path);
+	undo_redo->add_do_method(Globals::get_singleton(), "set_persisting", name, true);
+
+	if (Globals::get_singleton()->has(name)) {
+		undo_redo->add_undo_property(Globals::get_singleton(), name, Globals::get_singleton()->get(name));
+	} else {
+		undo_redo->add_undo_property(Globals::get_singleton(), name, Variant());
+	}
+
+	undo_redo->add_do_method(this, "update_autoload");
+	undo_redo->add_undo_method(this, "update_autoload");
+
+	undo_redo->add_do_method(this, "emit_signal", autoload_changed);
+	undo_redo->add_undo_method(this, "emit_signal", autoload_changed);
+
+	undo_redo->commit_action();
+
+	autoload_add_path->get_line_edit()->set_text("");
+	autoload_add_name->set_text("");
+}
+
+void EditorAutoloadSettings::_autoload_selected() {
+
+	TreeItem *ti = tree->get_selected();
+
+	if (!ti)
+		return;
+
+	selected_autoload = "autoload/" + ti->get_text(0);
+}
+
+void EditorAutoloadSettings::_autoload_edited() {
+
+	if (updating_autoload)
+		return;
+
+	TreeItem *ti = tree->get_edited();
+	int column = tree->get_edited_column();
+
+	UndoRedo *undo_redo = EditorNode::get_undo_redo();
+
+	if (column == 0) {
+		String name = ti->get_text(0);
+		String old_name = selected_autoload.get_slice("/", 1);
+
+		if (name == old_name)
+			return;
+
+		String error;
+		if (!_autoload_name_is_valid(name, &error)) {
+			ti->set_text(0, old_name);
+			EditorNode::get_singleton()->show_warning(error);
+			return;
+		}
+
+		if (Globals::get_singleton()->has("autoload/" + name)) {
+			ti->set_text(0, old_name);
+			EditorNode::get_singleton()->show_warning(vformat(TTR("Autoload '%s' already exists!"), name));
+			return;
+		}
+
+		updating_autoload = true;
+
+		name = "autoload/" + name;
+
+		bool persisting = Globals::get_singleton()->get(selected_autoload);
+		int order = Globals::get_singleton()->get(selected_autoload);
+		String path = Globals::get_singleton()->get(selected_autoload);
+
+		undo_redo->create_action(TTR("Rename Autoload"));
+
+		undo_redo->add_do_property(Globals::get_singleton(), name, path);
+		undo_redo->add_do_method(Globals::get_singleton(), "set_persisting", name, persisting);
+		undo_redo->add_do_method(Globals::get_singleton(), "set_order", name, order);
+		undo_redo->add_do_method(Globals::get_singleton(), "clear", selected_autoload);
+
+		undo_redo->add_undo_property(Globals::get_singleton(), selected_autoload, path);
+		undo_redo->add_undo_method(Globals::get_singleton(), "set_persisting", selected_autoload, persisting);
+		undo_redo->add_undo_method(Globals::get_singleton(), "set_order", selected_autoload, order);
+		undo_redo->add_undo_method(Globals::get_singleton(), "clear", name);
+
+		undo_redo->add_do_method(this, "update_autoload");
+		undo_redo->add_undo_method(this, "update_autoload");
+
+		undo_redo->add_do_method(this, "emit_signal", autoload_changed);
+		undo_redo->add_undo_method(this, "emit_signal", autoload_changed);
+
+		undo_redo->commit_action();
+
+		selected_autoload = name;
+	} else if (column == 2) {
+		updating_autoload = true;
+
+		bool checked = ti->is_checked(2);
+		String base = "autoload/" + ti->get_text(0);
+
+		int order = Globals::get_singleton()->get_order(base);
+		String path = Globals::get_singleton()->get(base);
+
+		if (path.begins_with("*"))
+			path = path.substr(1, path.length());
+
+		if (checked)
+			path = "*" + path;
+
+		undo_redo->create_action(TTR("Toggle AutoLoad Globals"));
+
+		undo_redo->add_do_property(Globals::get_singleton(), base, path);
+		undo_redo->add_undo_property(Globals::get_singleton(), base, Globals::get_singleton()->get(base));
+
+		undo_redo->add_do_method(Globals::get_singleton(),"set_order", base, order);
+		undo_redo->add_undo_method(Globals::get_singleton(),"set_order", base, order);
+
+		undo_redo->add_do_method(this, "update_autoload");
+		undo_redo->add_undo_method(this, "update_autoload");
+
+		undo_redo->add_do_method(this, "emit_signal", autoload_changed);
+		undo_redo->add_undo_method(this, "emit_signal", autoload_changed);
+
+		undo_redo->commit_action();
+	}
+
+	updating_autoload = false;
+}
+
+void EditorAutoloadSettings::_autoload_button_pressed(Object *p_item, int p_column, int p_button) {
+
+	TreeItem *ti = p_item->cast_to<TreeItem>();
+
+	String name = "autoload/" + ti->get_text(0);
+
+	UndoRedo *undo_redo = EditorNode::get_undo_redo();
+
+	switch (p_button) {
+
+		case BUTTON_MOVE_UP: 
+		case BUTTON_MOVE_DOWN: {
+
+			TreeItem *swap = NULL;
+
+			if (p_button == BUTTON_MOVE_UP) {
+				swap = ti->get_prev();
+			} else {
+				swap = ti->get_next();
+			}
+
+			if (!swap)
+				return;
+
+			String swap_name = "autoload/" + swap->get_text(0);
+
+			int order = Globals::get_singleton()->get_order(name);
+			int swap_order = Globals::get_singleton()->get_order(swap_name);
+
+			undo_redo->create_action(TTR("Move Autoload"));
+
+			undo_redo->add_do_method(Globals::get_singleton(), "set_order", name, swap_order);
+			undo_redo->add_undo_method(Globals::get_singleton(), "set_order", name, order);
+
+			undo_redo->add_do_method(Globals::get_singleton(), "set_order", swap_name, order);
+			undo_redo->add_undo_method(Globals::get_singleton(), "set_order", swap_name, swap_order);
+
+			undo_redo->add_do_method(this, "update_autoload");
+			undo_redo->add_undo_method(this, "update_autoload");
+
+			undo_redo->add_do_method(this, "emit_signal", autoload_changed);
+			undo_redo->add_undo_method(this, "emit_signal", autoload_changed);
+
+			undo_redo->commit_action();
+		} break;
+		case BUTTON_DELETE: {
+
+			int order = Globals::get_singleton()->get_order(name);
+
+			undo_redo->create_action(TTR("Remove Autoload"));
+
+			undo_redo->add_do_property(Globals::get_singleton(), name, Variant());
+
+			undo_redo->add_undo_property(Globals::get_singleton(), name, Globals::get_singleton()->get(name));
+			undo_redo->add_undo_method(Globals::get_singleton(), "set_persisting", name, true);
+			undo_redo->add_undo_method(Globals::get_singleton(), "set_order", order);
+
+			undo_redo->add_do_method(this, "update_autoload");
+			undo_redo->add_undo_method(this, "update_autoload");
+
+			undo_redo->add_do_method(this, "emit_signal", autoload_changed);
+			undo_redo->add_undo_method(this, "emit_signal", autoload_changed);
+
+			undo_redo->commit_action();
+		} break;
+	}
+}
+
+void EditorAutoloadSettings::_autoload_file_callback(const String& p_path) {
+
+	autoload_add_name->set_text(p_path.get_file().basename());
+}
+
+void EditorAutoloadSettings::update_autoload() {
+
+	if (updating_autoload)
+		return;
+
+	updating_autoload = true;
+
+	autoload_cache.clear();
+
+	tree->clear();
+	TreeItem *root = tree->create_item();
+
+	List<PropertyInfo> props;
+	Globals::get_singleton()->get_property_list(&props);
+
+	for (List<PropertyInfo>::Element *E = props.front(); E; E = E->next()) {
+
+		const PropertyInfo &pi = E->get();
+
+		if (!pi.name.begins_with("autoload/"))
+			continue;
+
+		String name = pi.name.get_slice("/", 1);
+		String path = Globals::get_singleton()->get(pi.name);
+
+		if (name.empty())
+			continue;
+
+		AutoLoadInfo info;
+		info.name = pi.name;
+		info.order = Globals::get_singleton()->get_order(pi.name);
+
+		autoload_cache.push_back(info);
+
+		bool global = false;
+
+		if (path.begins_with("*")) {
+			global = true;
+			path = path.substr(1, path.length());
+		}
+
+		TreeItem *item = tree->create_item(root);
+		item->set_text(0, name);
+		item->set_editable(0, true);
+
+		item->set_text(1, path);
+		item->set_selectable(1, false);
+
+		item->set_cell_mode(2, TreeItem::CELL_MODE_CHECK);
+		item->set_editable(2, true);
+		item->set_text(2, TTR("Enable"));
+		item->set_checked(2, global);
+
+		item->add_button(3, get_icon("MoveUp","EditorIcons"), BUTTON_MOVE_UP);
+		item->add_button(3, get_icon("MoveDown","EditorIcons"), BUTTON_MOVE_DOWN);
+		item->add_button(3, get_icon("Del","EditorIcons"), BUTTON_DELETE);
+		item->set_selectable(3, false);
+	}
+
+	updating_autoload = false;
+}
+
+Variant EditorAutoloadSettings::get_drag_data_fw(const Point2& p_point, Control *p_control) {
+
+	if (autoload_cache.size() <= 1)
+		return false;
+
+	StringArray autoloads;
+
+	TreeItem *next = tree->get_next_selected(NULL);
+
+	while (next) {
+		autoloads.push_back(next->get_text(0));
+		next = tree->get_next_selected(next);
+	}
+
+	if (autoloads.size() == 0 || autoloads.size() == autoload_cache.size())
+		return Variant();
+
+	VBoxContainer *preview = memnew( VBoxContainer );
+
+	int max_size = MIN(PREVIEW_LIST_MAX_SIZE, autoloads.size());
+
+	for (int i = 0; i < max_size; i++) {
+		Label *label = memnew( Label(autoloads[i]) );
+		label->set_self_opacity(Math::lerp(1, 0, float(i)/PREVIEW_LIST_MAX_SIZE));
+
+		preview->add_child(label);
+	}
+
+	tree->set_drop_mode_flags(Tree::DROP_MODE_INBETWEEN);
+	tree->set_drag_preview(preview);
+
+	Dictionary drop_data;
+	drop_data["type"] = "autoload";
+	drop_data["autoloads"] = autoloads;
+
+	return drop_data;
+}
+
+bool EditorAutoloadSettings::can_drop_data_fw(const Point2& p_point, const Variant& p_data, Control *p_control) const {
+	if (updating_autoload)
+		return false;
+
+	Dictionary drop_data = p_data;
+
+	if (!drop_data.has("type"))
+		return false;
+
+	if (drop_data.has("type")) {
+		TreeItem *ti = tree->get_item_at_pos(p_point);
+
+		if (!ti)
+			return false;
+
+		int section = tree->get_drop_section_at_pos(p_point);
+
+		if (section < -1)
+			return false;
+
+		return true;
+	}
+
+	return false;
+}
+
+void EditorAutoloadSettings::drop_data_fw(const Point2& p_point, const Variant& p_data, Control *p_control) {
+
+	TreeItem *ti = tree->get_item_at_pos(p_point);
+
+	if (!ti)
+		return;
+
+	int section = tree->get_drop_section_at_pos(p_point);
+
+	if (section < -1)
+		return;
+
+	String name;
+	bool move_to_back = false;
+
+	if (section < 0) {
+		name = ti->get_text(0);
+	} else if (ti->get_next()) {
+		name = ti->get_next()->get_text(0);
+	} else {
+		name = ti->get_text(0);
+		move_to_back = true;
+	}
+
+	int order = Globals::get_singleton()->get_order("autoload/" + name);
+
+	AutoLoadInfo aux;
+	List<AutoLoadInfo>::Element *E = NULL;
+
+	if (!move_to_back) {
+		aux.order = order;
+		E = autoload_cache.find(aux);
+	}
+
+	Dictionary drop_data = p_data;
+	StringArray autoloads = drop_data["autoloads"];
+
+	Vector<int> orders;
+	orders.resize(autoload_cache.size());
+
+	for (int i = 0; i < autoloads.size(); i++) {
+		aux.order = Globals::get_singleton()->get_order("autoload/" + autoloads[i]);
+
+		List<AutoLoadInfo>::Element *I = autoload_cache.find(aux);
+
+		if (move_to_back) {
+			autoload_cache.move_to_back(I);
+		} else if (E != I) {
+			autoload_cache.move_before(I, E);
+		} else if (E->next()) {
+			E = E->next();
+		} else {
+			break;
+		}
+	}
+
+	int i = 0;
+
+	for (List<AutoLoadInfo>::Element *E = autoload_cache.front(); E; E = E->next()) {
+		orders[i++] = E->get().order;
+	}
+
+	orders.sort();
+
+	UndoRedo *undo_redo = EditorNode::get_undo_redo();
+
+	undo_redo->create_action(TTR("Rearrange Autoloads"));
+
+	i = 0;
+
+	for (List<AutoLoadInfo>::Element *E = autoload_cache.front(); E; E = E->next()) {
+		undo_redo->add_do_method(Globals::get_singleton(), "set_order", E->get().name, orders[i++]);
+		undo_redo->add_undo_method(Globals::get_singleton(), "set_order", E->get().name, E->get().order);
+	}
+
+	orders.clear();
+
+	undo_redo->add_do_method(this, "update_autoload");
+	undo_redo->add_undo_method(this, "update_autoload");
+
+	undo_redo->add_do_method(this, "emit_signal", autoload_changed);
+	undo_redo->add_undo_method(this, "emit_signal", autoload_changed);
+
+	undo_redo->commit_action();
+}
+
+void EditorAutoloadSettings::_bind_methods() {
+
+	ObjectTypeDB::bind_method("_autoload_add", &EditorAutoloadSettings::_autoload_add);
+	ObjectTypeDB::bind_method("_autoload_selected", &EditorAutoloadSettings::_autoload_selected);
+	ObjectTypeDB::bind_method("_autoload_edited", &EditorAutoloadSettings::_autoload_edited);
+	ObjectTypeDB::bind_method("_autoload_button_pressed", &EditorAutoloadSettings::_autoload_button_pressed);
+	ObjectTypeDB::bind_method("_autoload_file_callback", &EditorAutoloadSettings::_autoload_file_callback);
+
+	ObjectTypeDB::bind_method("get_drag_data_fw", &EditorAutoloadSettings::get_drag_data_fw);
+	ObjectTypeDB::bind_method("can_drop_data_fw", &EditorAutoloadSettings::can_drop_data_fw);
+	ObjectTypeDB::bind_method("drop_data_fw", &EditorAutoloadSettings::drop_data_fw);
+
+	ObjectTypeDB::bind_method("update_autoload", &EditorAutoloadSettings::update_autoload);
+
+	ADD_SIGNAL(MethodInfo("autoload_changed"));
+}
+
+EditorAutoloadSettings::EditorAutoloadSettings() {
+
+	autoload_changed = "autoload_changed";
+
+	updating_autoload = false;
+	selected_autoload = "";
+
+	HBoxContainer *hbc = memnew( HBoxContainer );
+	add_child(hbc);
+
+	VBoxContainer *vbc_path = memnew( VBoxContainer );
+	vbc_path->set_h_size_flags(SIZE_EXPAND_FILL);
+
+	autoload_add_path = memnew( EditorLineEditFileChooser );
+	autoload_add_path->set_h_size_flags(SIZE_EXPAND_FILL);
+
+	autoload_add_path->get_file_dialog()->set_mode(EditorFileDialog::MODE_OPEN_FILE);
+	autoload_add_path->get_file_dialog()->connect("file_selected", this, "_autoload_file_callback");
+
+	vbc_path->add_margin_child(TTR("Path:"), autoload_add_path);
+	hbc->add_child(vbc_path);
+
+	VBoxContainer *vbc_name = memnew( VBoxContainer );
+	vbc_name->set_h_size_flags(SIZE_EXPAND_FILL);
+
+	HBoxContainer *hbc_name = memnew( HBoxContainer );
+
+	autoload_add_name = memnew( LineEdit );
+	autoload_add_name->set_h_size_flags(SIZE_EXPAND_FILL);
+	hbc_name->add_child(autoload_add_name);
+
+	Button *add_autoload = memnew( Button );
+	add_autoload->set_text(TTR("Add"));
+	hbc_name->add_child(add_autoload);
+	add_autoload->connect("pressed", this, "_autoload_add");
+
+	vbc_name->add_margin_child(TTR("Node Name:"), hbc_name);
+	hbc->add_child(vbc_name);
+
+	tree = memnew( Tree );
+	tree->set_hide_root(true);
+	tree->set_select_mode(Tree::SELECT_MULTI);
+	tree->set_single_select_cell_editing_only_when_already_selected(true);
+
+	tree->set_drag_forwarding(this);
+
+	tree->set_columns(4);
+	tree->set_column_titles_visible(true);
+
+	tree->set_column_title(0,TTR("Name"));
+	tree->set_column_expand(0,true);
+	tree->set_column_min_width(0,100);
+
+	tree->set_column_title(1,TTR("Path"));
+	tree->set_column_expand(1,true);
+	tree->set_column_min_width(1,100);
+
+	tree->set_column_title(2,TTR("Singleton"));
+	tree->set_column_expand(2,false);
+	tree->set_column_min_width(2,80);
+
+	tree->set_column_expand(3,false);
+	tree->set_column_min_width(3,80);
+
+	tree->connect("cell_selected", this, "_autoload_selected");
+	tree->connect("item_edited", this, "_autoload_edited");
+	tree->connect("button_pressed", this, "_autoload_button_pressed");
+
+	add_margin_child(TTR("List:"), tree, true);
+}
+
diff --git a/tools/editor/editor_autoload_settings.h b/tools/editor/editor_autoload_settings.h
new file mode 100644
index 00000000000..b8825f807c2
--- /dev/null
+++ b/tools/editor/editor_autoload_settings.h
@@ -0,0 +1,94 @@
+/*************************************************************************/
+/*  editor_autoload_settings.h                                           */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                    http://www.godotengine.org                         */
+/*************************************************************************/
+/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur.                 */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#ifndef EDITOR_AUTOLOAD_SETTINGS_H
+#define EDITOR_AUTOLOAD_SETTINGS_H
+
+#include "scene/gui/tree.h"
+
+#include "editor_file_dialog.h"
+
+class EditorAutoloadSettings : public VBoxContainer {
+
+	OBJ_TYPE( EditorAutoloadSettings, VBoxContainer );
+
+	enum {
+		BUTTON_MOVE_UP,
+		BUTTON_MOVE_DOWN,
+		BUTTON_DELETE
+	};
+
+	static StringName autoload_changed;
+
+	struct AutoLoadInfo {
+		String name;
+		int order;
+
+		bool operator==(const AutoLoadInfo& p_info) {
+			return order == p_info.order;
+		}
+	};
+
+	List<AutoLoadInfo> autoload_cache;
+
+	bool updating_autoload;
+	int number_of_autoloads;
+	String selected_autoload;
+
+	Tree *tree;
+	EditorLineEditFileChooser *autoload_add_path;
+	LineEdit *autoload_add_name;
+
+	bool _autoload_name_is_valid(const String& p_string, String *r_error = NULL);
+
+	void _autoload_add();
+	void _autoload_selected();
+	void _autoload_edited();
+	void _autoload_button_pressed(Object *p_item, int p_column, int p_button);
+	void _autoload_file_callback(const String& p_path);
+
+	Variant get_drag_data_fw(const Point2& p_point, Control *p_from);
+	bool can_drop_data_fw(const Point2& p_point, const Variant& p_data, Control *p_from) const;
+	void drop_data_fw(const Point2& p_point, const Variant& p_data, Control *p_from);
+
+protected:
+
+	void _notification(int p_what);
+	static void _bind_methods();
+
+public:
+
+	void update_autoload();
+
+	EditorAutoloadSettings();
+
+};
+
+#endif
+
diff --git a/tools/editor/project_settings.cpp b/tools/editor/project_settings.cpp
index 6822e50b73a..171e6565824 100644
--- a/tools/editor/project_settings.cpp
+++ b/tools/editor/project_settings.cpp
@@ -100,16 +100,6 @@ void ProjectSettings::_notification(int p_what) {
 			translation_res_file_open->add_filter("*."+E->get());
 			translation_res_option_file_open->add_filter("*."+E->get());
 		}
-
-		List<String> afn;
-		ResourceLoader::get_recognized_extensions_for_type("Script",&afn);
-		ResourceLoader::get_recognized_extensions_for_type("PackedScene",&afn);
-
-		for (List<String>::Element *E=afn.front();E;E=E->next()) {
-
-			autoload_file_open->add_filter("*."+E->get());
-		}
-
 	}
 }
 
@@ -564,7 +554,7 @@ void ProjectSettings::popup_project_settings() {
 	popup_centered_ratio();
 	globals_editor->update_category_list();
 	_update_translations();
-	_update_autoload();
+	autoload_settings->update_autoload();
 	plugin_settings->update_plugins();
 }
 
@@ -811,263 +801,6 @@ void ProjectSettings::_translation_file_open() {
 	translation_file_open->popup_centered_ratio();
 }
 
-
-void ProjectSettings::_autoload_file_callback(const String& p_path) {
-
-	autoload_add_path->set_text(p_path);
-	//if (autoload_add_name->get_text().strip_edges()==String()) {
-
-		autoload_add_name->set_text( p_path.get_file().basename() );
-	//}
-
-	//_translation_add(p_translation);
-}
-
-void ProjectSettings::_autoload_file_open() {
-
-	autoload_file_open->popup_centered_ratio();
-}
-
-void ProjectSettings::_autoload_edited() {
-
-	if (updating_autoload)
-		return;
-
-	TreeItem *ti = autoload_list->get_edited();
-	int column = autoload_list->get_edited_column();
-
-	if (!ti || (column != 0 && column != 2))
-		return;
-
-	if (column == 0) {
-		String name = ti->get_text(0);
-		String old_name = selected_autoload.substr(selected_autoload.find("/")+1,selected_autoload.length());
-
-		if (!name.is_valid_identifier()) {
-			ti->set_text(0,old_name);
-			message->set_text(TTR("Invalid name.")+"\n"+TTR("Valid characters:")+" a-z, A-Z, 0-9 or _");
-			message->popup_centered(Size2(300,100));
-			return;
-		}
-
-		if (ObjectTypeDB::type_exists(name)) {
-			ti->set_text(0,old_name);
-			message->set_text(TTR("Invalid name. Must not collide with an existing engine class name."));
-			message->popup_centered(Size2(400,100));
-			return;
-		}
-
-		for(int i=0;i<Variant::VARIANT_MAX;i++) {
-			if (Variant::get_type_name(Variant::Type(i))==name) {
-				ti->set_text(0,old_name);
-				message->set_text(TTR("Invalid name. Must not collide with an existing buit-in type name."));
-				message->popup_centered(Size2(400,100));
-				return;
-			}
-		}
-
-		for(int i=0;i<GlobalConstants::get_global_constant_count();i++) {
-			if (GlobalConstants::get_global_constant_name(i)==name) {
-				ti->set_text(0,old_name);
-				message->set_text(TTR("Invalid name. Must not collide with an existing global constant name."));
-				message->popup_centered(Size2(400,100));
-				return;
-			}
-		}
-
-		if (Globals::get_singleton()->has("autoload/"+name)) {
-			ti->set_text(0,old_name);
-			message->set_text(vformat(TTR("Autoload '%s' already exists!"),name));
-			message->popup_centered(Size2(300,100));
-			return;
-		}
-
-		updating_autoload = true;
-
-		name = "autoload/"+name;
-		String path = Globals::get_singleton()->get(selected_autoload);
-		bool is_persisting = Globals::get_singleton()->is_persisting(selected_autoload);
-		int order = Globals::get_singleton()->get_order(selected_autoload);
-
-		undo_redo->create_action(TTR("Rename Autoload"));
-		undo_redo->add_do_property(Globals::get_singleton(),name,path);
-		undo_redo->add_do_method(Globals::get_singleton(),"set_persisting",name,is_persisting);
-		undo_redo->add_do_method(Globals::get_singleton(),"set_order",name,order);
-		undo_redo->add_do_method(Globals::get_singleton(),"clear",selected_autoload);
-		undo_redo->add_undo_property(Globals::get_singleton(),selected_autoload,path);
-		undo_redo->add_undo_method(Globals::get_singleton(),"set_persisting",selected_autoload,is_persisting);
-		undo_redo->add_undo_method(Globals::get_singleton(),"set_order",selected_autoload,order);
-		undo_redo->add_undo_method(Globals::get_singleton(),"clear",name);
-		undo_redo->add_do_method(this,"_update_autoload");
-		undo_redo->add_undo_method(this,"_update_autoload");
-		undo_redo->add_do_method(this,"_settings_changed");
-		undo_redo->add_undo_method(this,"_settings_changed");
-		undo_redo->commit_action();
-
-		selected_autoload = name;
-	} else if (column == 2) {
-		updating_autoload = true;
-
-		bool checked = ti->is_checked(2);
-		String base = "autoload/"+ti->get_text(0);
-		String path = Globals::get_singleton()->get(base);
-		int order = Globals::get_singleton()->get_order(base);
-
-		if (path.begins_with("*"))
-			path = path.substr(1,path.length());
-
-		if (checked)
-			path = "*" + path;
-
-		undo_redo->create_action(TTR("Toggle AutoLoad Globals"));
-		undo_redo->add_do_property(Globals::get_singleton(),base,path);
-		undo_redo->add_undo_property(Globals::get_singleton(),base,Globals::get_singleton()->get(base));
-		undo_redo->add_do_method(Globals::get_singleton(),"set_order",base,order); // keep order, as config order matters for these
-		undo_redo->add_undo_method(Globals::get_singleton(),"set_order",base,order);
-		undo_redo->add_do_method(this,"_update_autoload");
-		undo_redo->add_undo_method(this,"_update_autoload");
-		undo_redo->add_do_method(this,"_settings_changed");
-		undo_redo->add_undo_method(this,"_settings_changed");
-		undo_redo->commit_action();
-	}
-
-	updating_autoload = false;
-}
-
-void ProjectSettings::_autoload_add() {
-
-	String name = autoload_add_name->get_text();
-	if (!name.is_valid_identifier()) {
-		message->set_text(TTR("Invalid name.")+"\n"+TTR("Valid characters:")+" a-z, A-Z, 0-9 or _");
-		message->popup_centered(Size2(300,100));
-		return;
-
-	}
-
-	if (ObjectTypeDB::type_exists(name)) {
-
-		message->set_text(TTR("Invalid name. Must not collide with an existing engine class name."));
-		message->popup_centered(Size2(300,100));
-		return;
-
-	}
-
-	for(int i=0;i<Variant::VARIANT_MAX;i++) {
-		if (Variant::get_type_name(Variant::Type(i))==name) {
-
-			message->set_text(TTR("Invalid name. Must not collide with an existing buit-in type name."));
-			message->popup_centered(Size2(300,100));
-			return;
-
-		}
-	}
-
-	for(int i=0;i<GlobalConstants::get_global_constant_count();i++) {
-
-		if (GlobalConstants::get_global_constant_name(i)==name) {
-
-			message->set_text(TTR("Invalid name. Must not collide with an existing global constant name."));
-			message->popup_centered(Size2(300,100));
-			return;
-		}
-
-	}
-
-	String path = autoload_add_path->get_text();
-	if (!FileAccess::exists(path)) {
-		message->set_text("Invalid Path.\nFile does not exist.");
-		message->popup_centered(Size2(300,100));
-		return;
-
-	}
-	if (!path.begins_with("res://")) {
-		message->set_text("Invalid Path.\nNot in resource path.");
-		message->popup_centered(Size2(300,100));
-		return;
-
-	}
-
-	undo_redo->create_action(TTR("Add Autoload"));
-	name = "autoload/"+name;
-	undo_redo->add_do_property(Globals::get_singleton(),name,"*"+path);
-	if (Globals::get_singleton()->has(name))
-		undo_redo->add_undo_property(Globals::get_singleton(),name,Globals::get_singleton()->get(name));
-	else
-		undo_redo->add_undo_property(Globals::get_singleton(),name,Variant());
-
-	undo_redo->add_do_method(Globals::get_singleton(),"set_persisting",name,true);
-	undo_redo->add_do_method(this,"_update_autoload");
-	undo_redo->add_undo_method(this,"_update_autoload");
-	undo_redo->add_do_method(this,"_settings_changed");
-	undo_redo->add_undo_method(this,"_settings_changed");
-	undo_redo->commit_action();
-
-	autoload_add_path->set_text("");
-	autoload_add_name->set_text("");
-
-	//autoload_file_open->popup_centered_ratio();
-}
-
-void ProjectSettings::_autoload_delete(Object *p_item,int p_column, int p_button) {
-
-
-	TreeItem *ti=p_item->cast_to<TreeItem>();
-	String name = "autoload/"+ti->get_text(0);
-
-	if (p_button==0) {
-		//delete
-		int order = Globals::get_singleton()->get_order(name);
-		undo_redo->create_action(TTR("Remove Autoload"));
-		undo_redo->add_do_property(Globals::get_singleton(),name,Variant());
-		undo_redo->add_undo_property(Globals::get_singleton(),name,Globals::get_singleton()->get(name));
-		undo_redo->add_undo_method(Globals::get_singleton(),"set_persisting",name,true);
-		undo_redo->add_undo_method(Globals::get_singleton(),"set_order",name,order);
-		undo_redo->add_do_method(this,"_update_autoload");
-		undo_redo->add_undo_method(this,"_update_autoload");
-		undo_redo->add_do_method(this,"_settings_changed");
-		undo_redo->add_undo_method(this,"_settings_changed");
-		undo_redo->commit_action();
-	} else {
-
-		TreeItem *swap = NULL;
-
-		if (p_button==1) {
-			swap=ti->get_prev();
-		} else if (p_button==2) {
-			swap=ti->get_next();
-		}
-		if (!swap)
-			return;
-
-		String swap_name= "autoload/"+swap->get_text(0);
-
-		int order = Globals::get_singleton()->get_order(name);
-		int swap_order = Globals::get_singleton()->get_order(swap_name);
-
-		undo_redo->create_action(TTR("Move Autoload"));
-		undo_redo->add_do_method(Globals::get_singleton(),"set_order",swap_name,order);
-		undo_redo->add_do_method(Globals::get_singleton(),"set_order",name,swap_order);
-		undo_redo->add_undo_method(Globals::get_singleton(),"set_order",swap_name,swap_order);
-		undo_redo->add_undo_method(Globals::get_singleton(),"set_order",name,order);
-		undo_redo->add_do_method(this,"_update_autoload");
-		undo_redo->add_undo_method(this,"_update_autoload");
-		undo_redo->add_do_method(this,"_settings_changed");
-		undo_redo->add_undo_method(this,"_settings_changed");
-		undo_redo->commit_action();
-
-	}
-
-}
-
-void ProjectSettings::_autoload_selected() {
-	TreeItem *ti = autoload_list->get_selected();
-
-	if (!ti)
-		return;
-
-	selected_autoload = "autoload/"+ti->get_text(0);
-}
-
 void ProjectSettings::_translation_delete(Object *p_item,int p_column, int p_button) {
 
 	TreeItem *ti = p_item->cast_to<TreeItem>();
@@ -1393,55 +1126,6 @@ void ProjectSettings::_update_translations() {
 
 }
 
-void ProjectSettings::_update_autoload() {
-
-	if (updating_autoload)
-		return;
-
-	updating_autoload=true;
-
-	autoload_list->clear();
-	TreeItem *root = autoload_list->create_item();
-	autoload_list->set_hide_root(true);
-
-	List<PropertyInfo> props;
-	Globals::get_singleton()->get_property_list(&props);
-
-	for(List<PropertyInfo>::Element *E=props.front();E;E=E->next()) {
-
-		const PropertyInfo &pi=E->get();
-		if (!pi.name.begins_with("autoload/"))
-			continue;
-
-		String name = pi.name.get_slice("/",1);
-		String path = Globals::get_singleton()->get(pi.name);
-
-		if (name=="")
-			continue;
-		bool global=false;
-		if (path.begins_with("*")) {
-			path=path.substr(1,path.length());
-			global=true;
-		}
-		TreeItem *t = autoload_list->create_item(root);
-		t->set_text(0,name);
-		t->set_editable(0,true);
-		t->set_text(1,path);
-		t->set_cell_mode(2,TreeItem::CELL_MODE_CHECK);
-		t->set_editable(2,true);
-		t->set_text(2,TTR("Enable"));
-		t->set_checked(2,global);
-		t->add_button(3,get_icon("MoveUp","EditorIcons"),1);
-		t->add_button(3,get_icon("MoveDown","EditorIcons"),2);
-		t->add_button(3,get_icon("Del","EditorIcons"),0);
-
-
-	}
-
-	updating_autoload=false;
-
-}
-
 void ProjectSettings::_toggle_search_bar(bool p_pressed) {
 
 	globals_editor->get_property_editor()->set_use_filter(p_pressed);
@@ -1508,14 +1192,6 @@ void ProjectSettings::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("_translation_res_delete"),&ProjectSettings::_translation_res_delete);
 	ObjectTypeDB::bind_method(_MD("_translation_res_option_delete"),&ProjectSettings::_translation_res_option_delete);
 
-	ObjectTypeDB::bind_method(_MD("_autoload_add"),&ProjectSettings::_autoload_add);
-	ObjectTypeDB::bind_method(_MD("_autoload_file_open"),&ProjectSettings::_autoload_file_open);
-	ObjectTypeDB::bind_method(_MD("_autoload_file_callback"),&ProjectSettings::_autoload_file_callback);
-	ObjectTypeDB::bind_method(_MD("_update_autoload"),&ProjectSettings::_update_autoload);
-	ObjectTypeDB::bind_method(_MD("_autoload_delete"),&ProjectSettings::_autoload_delete);
-	ObjectTypeDB::bind_method(_MD("_autoload_edited"),&ProjectSettings::_autoload_edited);
-	ObjectTypeDB::bind_method(_MD("_autoload_selected"),&ProjectSettings::_autoload_selected);
-
 	ObjectTypeDB::bind_method(_MD("_clear_search_box"),&ProjectSettings::_clear_search_box);
 	ObjectTypeDB::bind_method(_MD("_toggle_search_bar"),&ProjectSettings::_toggle_search_bar);
 
@@ -1858,69 +1534,10 @@ ProjectSettings::ProjectSettings(EditorData *p_data) {
 
 
 	{
-		VBoxContainer *avb = memnew( VBoxContainer );
-		tab_container->add_child(avb);
-		avb->set_name(TTR("AutoLoad"));
-		HBoxContainer *ahb = memnew( HBoxContainer);
-		avb->add_child(ahb);
-
-
-		VBoxContainer *avb_path = memnew( VBoxContainer );
-		avb_path->set_h_size_flags(SIZE_EXPAND_FILL);
-		HBoxContainer *ahb_path = memnew( HBoxContainer );
-		autoload_add_path = memnew(LineEdit);
-		autoload_add_path->set_h_size_flags(SIZE_EXPAND_FILL);
-		ahb_path->add_child(autoload_add_path);
-		Button *browseaa = memnew( Button("..") );
-		ahb_path->add_child(browseaa);
-		browseaa->connect("pressed",this,"_autoload_file_open");
-
-		avb_path->add_margin_child(TTR("Path:"),ahb_path);
-		ahb->add_child(avb_path);
-
-		VBoxContainer *avb_name = memnew( VBoxContainer );
-		avb_name->set_h_size_flags(SIZE_EXPAND_FILL);
-
-		HBoxContainer *ahb_name = memnew( HBoxContainer );
-		autoload_add_name = memnew(LineEdit);
-		autoload_add_name->set_h_size_flags(SIZE_EXPAND_FILL);
-		ahb_name->add_child(autoload_add_name);
-		avb_name->add_margin_child(TTR("Node Name:"),ahb_name);
-		Button *addaa = memnew( Button(TTR("Add")) );
-		ahb_name->add_child(addaa);
-		addaa->connect("pressed",this,"_autoload_add");
-
-		ahb->add_child(avb_name);
-
-		autoload_list = memnew( Tree );
-		autoload_list->set_v_size_flags(SIZE_EXPAND_FILL);
-		avb->add_margin_child(TTR("List:"),autoload_list,true);
-
-		autoload_file_open=memnew( EditorFileDialog );
-		add_child(autoload_file_open);
-		autoload_file_open->set_mode(EditorFileDialog::MODE_OPEN_FILE);
-		autoload_file_open->connect("file_selected",this,"_autoload_file_callback");
-
-		autoload_list->set_columns(4);
-		autoload_list->set_column_titles_visible(true);
-		autoload_list->set_column_title(0,TTR("Name"));
-		autoload_list->set_column_expand(0,true);
-		autoload_list->set_column_min_width(0,100);
-		autoload_list->set_column_title(1,TTR("Path"));
-		autoload_list->set_column_expand(1,true);
-		autoload_list->set_column_min_width(1,100);
-		autoload_list->set_column_title(2,TTR("Singleton"));
-		autoload_list->set_column_expand(2,false);
-		autoload_list->set_column_min_width(2,80);
-		autoload_list->set_column_expand(3,false);
-		autoload_list->set_column_min_width(3,80);
-
-		autoload_list->connect("button_pressed",this,"_autoload_delete");
-		autoload_list->connect("item_edited",this,"_autoload_edited");
-		autoload_list->connect("cell_selected", this, "_autoload_selected");
-
-		updating_autoload=false;
-
+		autoload_settings = memnew( EditorAutoloadSettings );
+		autoload_settings->set_name(TTR("AutoLoad"));
+		tab_container->add_child(autoload_settings);
+		autoload_settings->connect("autoload_changed", this, "_settings_changed");
 	}
 
 	{
diff --git a/tools/editor/project_settings.h b/tools/editor/project_settings.h
index 79e1acf75ec..46e98f69ad6 100644
--- a/tools/editor/project_settings.h
+++ b/tools/editor/project_settings.h
@@ -34,6 +34,7 @@
 #include "undo_redo.h"
 #include "editor_data.h"
 #include "scene/gui/tab_container.h"
+#include "editor_autoload_settings.h"
 #include "editor_plugin_settings.h"
 
 //#include "project_export_settings.h"
@@ -88,26 +89,10 @@ class ProjectSettings : public AcceptDialog {
 	Tree *translation_remap;
 	Tree *translation_remap_options;
 
-
-	Tree *autoload_list;
-	String selected_autoload;
-	EditorFileDialog *autoload_file_open;
-	LineEdit *autoload_add_name;
-	LineEdit *autoload_add_path;
-
+	EditorAutoloadSettings *autoload_settings;
 
 	EditorPluginSettings *plugin_settings;
 
-	void _update_autoload();
-	void _autoload_file_callback(const String& p_path);
-	void _autoload_add();
-	void _autoload_edited();
-	void _autoload_file_open();
-	void _autoload_delete(Object *p_item,int p_column, int p_button);
-	void _autoload_selected();
-	bool updating_autoload;
-
-
 	void _item_selected();
 	void _item_adds(String);
 	void _item_add();