diff --git a/source.list b/source.list
--- a/source.list
+++ b/source.list
@@ -124,7 +124,6 @@ window.cpp
 	sound/allegro_s.h
 	video/allegro_v.h
 #end
-ai/ai.h
 aircraft.h
 airport.h
 airport_movement.h
@@ -161,7 +160,6 @@ date_func.h
 date_type.h
 debug.h
 video/dedicated_v.h
-ai/default/default.h
 depot_base.h
 depot_func.h
 depot_map.h
@@ -316,7 +314,6 @@ train.h
 transparency.h
 transparency_gui.h
 transport_type.h
-ai/trolly/trolly.h
 tunnelbridge.h
 unmovable.h
 variables.h
@@ -511,13 +508,173 @@ table/unicode.h
 table/unmovable_land.h
 table/water_land.h
 
-# AI Files
-ai/ai.cpp
-ai/trolly/build.cpp
-ai/default/default.cpp
-ai/trolly/pathfinder.cpp
-ai/trolly/shared.cpp
-ai/trolly/trolly.cpp
+# Script
+script/squirrel.cpp
+script/squirrel.hpp
+script/squirrel_class.hpp
+script/squirrel_helper.hpp
+script/squirrel_helper_type.hpp
+script/squirrel_std.cpp
+script/squirrel_std.hpp
+
+# Squirrel
+3rdparty/squirrel/squirrel/sqapi.cpp
+3rdparty/squirrel/squirrel/sqbaselib.cpp
+3rdparty/squirrel/squirrel/sqclass.cpp
+3rdparty/squirrel/squirrel/sqcompiler.cpp
+3rdparty/squirrel/squirrel/sqdebug.cpp
+3rdparty/squirrel/squirrel/sqfuncstate.cpp
+3rdparty/squirrel/squirrel/sqlexer.cpp
+3rdparty/squirrel/squirrel/sqmem.cpp
+3rdparty/squirrel/squirrel/sqobject.cpp
+3rdparty/squirrel/squirrel/sqstate.cpp
+3rdparty/squirrel/sqstdlib/sqstdaux.cpp
+3rdparty/squirrel/squirrel/sqtable.cpp
+3rdparty/squirrel/squirrel/sqvm.cpp
+
+# Squirrel headers
+3rdparty/squirrel/squirrel/sqarray.h
+3rdparty/squirrel/squirrel/sqclass.h
+3rdparty/squirrel/squirrel/sqclosure.h
+3rdparty/squirrel/squirrel/sqcompiler.h
+3rdparty/squirrel/squirrel/sqfuncproto.h
+3rdparty/squirrel/squirrel/sqfuncstate.h
+3rdparty/squirrel/squirrel/sqlexer.h
+3rdparty/squirrel/squirrel/sqobject.h
+3rdparty/squirrel/squirrel/sqopcodes.h
+3rdparty/squirrel/squirrel/sqpcheader.h
+3rdparty/squirrel/squirrel/sqstate.h
+3rdparty/squirrel/include/sqstdaux.h
+3rdparty/squirrel/include/sqstdblob.h
+3rdparty/squirrel/sqstdlib/sqstdblobimpl.h
+3rdparty/squirrel/include/sqstdio.h
+3rdparty/squirrel/include/sqstdmath.h
+3rdparty/squirrel/sqstdlib/sqstdstream.h
+3rdparty/squirrel/include/sqstdstring.h
+3rdparty/squirrel/include/sqstdsystem.h
+3rdparty/squirrel/squirrel/sqstring.h
+3rdparty/squirrel/squirrel/sqtable.h
+3rdparty/squirrel/include/squirrel.h
+3rdparty/squirrel/squirrel/squserdata.h
+3rdparty/squirrel/squirrel/squtils.h
+3rdparty/squirrel/squirrel/sqvm.h
+
+# AI Core
+ai/ai.hpp
+#if HAVE_THREAD
+ai/ai_config.cpp
+ai/ai_config.hpp
+ai/ai_core.cpp
+ai/ai_gui.cpp
+ai/ai_gui.hpp
+ai/ai_info.cpp
+ai/ai_info.hpp
+ai/ai_info_dummy.cpp
+ai/ai_instance.cpp
+ai/ai_instance.hpp
+ai/ai_scanner.cpp
+ai/ai_scanner.hpp
+ai/ai_storage.hpp
+
+# AI API
+ai/api/ai_abstractlist.hpp
+ai/api/ai_accounting.hpp
+ai/api/ai_airport.hpp
+ai/api/ai_base.hpp
+ai/api/ai_bridge.hpp
+ai/api/ai_bridgelist.hpp
+ai/api/ai_cargo.hpp
+ai/api/ai_cargolist.hpp
+ai/api/ai_company.hpp
+ai/api/ai_controller.hpp
+ai/api/ai_date.hpp
+ai/api/ai_depotlist.hpp
+ai/api/ai_engine.hpp
+ai/api/ai_enginelist.hpp
+ai/api/ai_error.hpp
+ai/api/ai_event.hpp
+ai/api/ai_event_types.hpp
+ai/api/ai_execmode.hpp
+ai/api/ai_gamesettings.hpp
+ai/api/ai_group.hpp
+ai/api/ai_grouplist.hpp
+ai/api/ai_industry.hpp
+ai/api/ai_industrylist.hpp
+ai/api/ai_industrytype.hpp
+ai/api/ai_industrytypelist.hpp
+ai/api/ai_list.hpp
+ai/api/ai_log.hpp
+ai/api/ai_map.hpp
+ai/api/ai_marine.hpp
+ai/api/ai_object.hpp
+ai/api/ai_order.hpp
+ai/api/ai_rail.hpp
+ai/api/ai_railtypelist.hpp
+ai/api/ai_road.hpp
+ai/api/ai_sign.hpp
+ai/api/ai_station.hpp
+ai/api/ai_stationlist.hpp
+ai/api/ai_subsidy.hpp
+ai/api/ai_subsidylist.hpp
+ai/api/ai_testmode.hpp
+ai/api/ai_tile.hpp
+ai/api/ai_tilelist.hpp
+ai/api/ai_town.hpp
+ai/api/ai_townlist.hpp
+ai/api/ai_tunnel.hpp
+ai/api/ai_types.hpp
+ai/api/ai_vehicle.hpp
+ai/api/ai_vehiclelist.hpp
+
+# AI API Implementation
+ai/api/ai_abstractlist.cpp
+ai/api/ai_accounting.cpp
+ai/api/ai_airport.cpp
+ai/api/ai_base.cpp
+ai/api/ai_bridge.cpp
+ai/api/ai_bridgelist.cpp
+ai/api/ai_cargo.cpp
+ai/api/ai_cargolist.cpp
+ai/api/ai_company.cpp
+ai/api/ai_controller.cpp
+ai/api/ai_date.cpp
+ai/api/ai_depotlist.cpp
+ai/api/ai_engine.cpp
+ai/api/ai_enginelist.cpp
+ai/api/ai_error.cpp
+ai/api/ai_event.cpp
+ai/api/ai_event_types.cpp
+ai/api/ai_execmode.cpp
+ai/api/ai_gamesettings.cpp
+ai/api/ai_group.cpp
+ai/api/ai_grouplist.cpp
+ai/api/ai_industry.cpp
+ai/api/ai_industrylist.cpp
+ai/api/ai_industrytype.cpp
+ai/api/ai_industrytypelist.cpp
+ai/api/ai_list.cpp
+ai/api/ai_log.cpp
+ai/api/ai_map.cpp
+ai/api/ai_marine.cpp
+ai/api/ai_object.cpp
+ai/api/ai_order.cpp
+ai/api/ai_rail.cpp
+ai/api/ai_railtypelist.cpp
+ai/api/ai_road.cpp
+ai/api/ai_sign.cpp
+ai/api/ai_station.cpp
+ai/api/ai_stationlist.cpp
+ai/api/ai_subsidy.cpp
+ai/api/ai_subsidylist.cpp
+ai/api/ai_testmode.cpp
+ai/api/ai_tile.cpp
+ai/api/ai_tilelist.cpp
+ai/api/ai_town.cpp
+ai/api/ai_townlist.cpp
+ai/api/ai_tunnel.cpp
+ai/api/ai_vehicle.cpp
+ai/api/ai_vehiclelist.cpp
+#end
 
 # Blitters
 #if DEDICATED