diff --git a/README.md b/README.md
index ff6aa1a..80eb9eb 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ Most features are usable by all classes, but a few are class-specific. If you wo
 * **Spy: Auto Disguise:** automatically disguises the Spy on left-click. If this is not desirable (for example, when placing a sapper), use MOUSE3 to perform a normal left-click. Also automatically changes the disguise's current weapon when actually switching weapons. Press F at any time to disable all auto disguise functions.
 
 ### Settings ###
-TF2-Scripts comes with several settings used to disable certain undesired features; edit them in `cfg\scripts\settings.cfg`:
+TF2-Scripts comes with several settings used to disable certain undesired features; edit them in `cfg\_settings.cfg`:
 * `AUTO_CROUCH_JUMP`
 * `AUTO_DISGUISE`
 * `CLEAR_CONSOLE_ON_START`
diff --git a/cfg/_lang.cfg b/cfg/_lang.cfg
new file mode 100644
index 0000000..29353ab
--- /dev/null
+++ b/cfg/_lang.cfg
@@ -0,0 +1,55 @@
+// Main Language File
+// This is a workaround for a limitation of the "developer 1" output.
+// When active and filtering, it seems only the first word following the echo
+// command gets printed, unless it's surrounded in quotation marks.
+// This file ties all of the echo lines in this folder together.
+
+alias show_debug_output_text "exec lang/show_debug_output_text.cfg"
+
+alias con_filter_clear_text "exec lang/con_filter_clear_text.cfg"
+
+alias music_1_text "exec lang/music_1_text.cfg"
+alias music_2_text "exec lang/music_2_text.cfg"
+alias music_3_text "exec lang/music_3_text.cfg"
+alias music_4_text "exec lang/music_4_text.cfg"
+alias music_5_text "exec lang/music_5_text.cfg"
+alias music_6_text "exec lang/music_6_text.cfg"
+alias music_7_text "exec lang/music_7_text.cfg"
+alias music_8_text "exec lang/music_8_text.cfg"
+alias music_9_text "exec lang/music_9_text.cfg"
+alias music_10_text "exec lang/music_10_text.cfg"
+alias music_11_text "exec lang/music_11_text.cfg"
+alias music_12_text "exec lang/music_12_text.cfg"
+alias music_13_text "exec lang/music_13_text.cfg"
+alias music_14_text "exec lang/music_14_text.cfg"
+alias music_15_text "exec lang/music_15_text.cfg"
+alias music_16_text "exec lang/music_16_text.cfg"
+alias music_17_text "exec lang/music_17_text.cfg"
+alias music_18_text "exec lang/music_18_text.cfg"
+alias music_19_text "exec lang/music_19_text.cfg"
+
+alias switch_loadout_A_text "exec lang/switch_loadout_A_text.cfg"
+alias switch_loadout_B_text "exec lang/switch_loadout_B_text.cfg"
+alias switch_loadout_C_text "exec lang/switch_loadout_C_text.cfg"
+alias switch_loadout_D_text "exec lang/switch_loadout_D_text.cfg"
+
+alias disguise_demoman_text "exec lang/disguise_demoman_text.cfg"
+alias disguise_pyro_text "exec lang/disguise_pyro_text.cfg"
+alias disguise_sniper_text "exec lang/disguise_sniper_text.cfg"
+alias disguise_engineer_text "exec lang/disguise_engineer_text.cfg"
+alias disguise_remove_text "exec lang/disguise_remove_text.cfg"
+
+alias auto_disguise_on_text "exec lang/auto_disguise_on_text.cfg"
+alias auto_disguise_off_text "exec lang/auto_disguise_off_text.cfg"
+
+alias pyro_airblast_text "exec lang/pyro_airblast_text.cfg
+
+alias spy_check_scout_text "exec lang/spy_check_scout_text.cfg"
+alias spy_check_soldier_text "exec lang/spy_check_soldier_text.cfg"
+alias spy_check_pyro_text "exec lang/spy_check_pyro_text.cfg"
+alias spy_check_demoman_text "exec lang/spy_check_demoman_text.cfg"
+alias spy_check_heavy_text "exec lang/spy_check_heavy_text.cfg"
+alias spy_check_engineer_text "exec lang/spy_check_engineer_text.cfg"
+alias spy_check_medic_text "exec lang/spy_check_medic_text.cfg"
+alias spy_check_sniper_text "exec lang/spy_check_sniper_text.cfg"
+alias spy_check_spy_text "exec lang/spy_check_spy_text.cfg"
\ No newline at end of file
diff --git a/cfg/_reset.cfg b/cfg/_reset.cfg
new file mode 100644
index 0000000..c5e6cb8
--- /dev/null
+++ b/cfg/_reset.cfg
@@ -0,0 +1,26 @@
+// Reset
+// Resets key bindings to their default state on class-switch.
+// Since class-specific files can change the key bindings, it's important to
+// return them to a neutral state each time the class changes.
+
+// Reset the mouse controls.
+bind MOUSE1 +attack
+bind MOUSE2 +attack2
+bind MOUSE3 +attack3
+bind MWHEELUP invprev
+bind MWHEELDOWN invnext
+
+// Reset all numbers.
+alias key0 slot10; bind 0 key0
+alias key1 slot1; bind 1 key1
+alias key2 slot2; bind 2 key2
+alias key3 slot3; bind 3 key3
+alias key4 slot4; bind 4 key4
+alias key5 slot5; bind 5 key5
+alias key6 slot6; bind 6 key6
+alias key7 slot7; bind 7 key7
+alias key8 slot8; bind 8 key8
+alias key9 slot9; bind 9 key9
+
+// Reset any other affected keys.
+bind F inspect
\ No newline at end of file
diff --git a/cfg/_settings.cfg b/cfg/_settings.cfg
new file mode 100644
index 0000000..26b7842
--- /dev/null
+++ b/cfg/_settings.cfg
@@ -0,0 +1,80 @@
+// Settings
+// User-configurable settings for the script pack.
+
+// AUTO_CROUCH_JUMP
+// Values: crouch_on | crouch_off
+// When set to crouch_on, automatically crouches when holding the jump button.
+alias AUTO_CROUCH_JUMP "crouch_on"
+
+// AUTO_DISGUISE
+// Values: disguise_on | disguise_off
+// Set to disguise_on to activate automatic disguise functions on Spy.
+// Set to disguise_off to de-activate them.
+// Note: be careful when placing sappers or otherwise using MOUSE1 without
+// meaning to attack, as this will automatically change the disguise. Use
+// MOUSE3 to perform a normal attack.
+alias AUTO_DISGUISE "disguise_on"
+
+// CLEAR_CONSOLE_ON_START
+// Values: clear_on | clear_off
+// Set to disguise_on if you want the developer console to be cleared once 
+// main.cfg is run (when the game starts). Otherwise, leave empty.
+alias CLEAR_CONSOLE_ON_START "clear_on"
+
+// DEBUG_OUTPUT_ON_START
+// Values: show_output | hide_output
+// Set to show_output to display the debug output by default on start.
+alias DEBUG_OUTPUT_ON_START "show_output"
+
+// ENGINEER_PDA
+// Values: pda_on | pda_off
+// Enables or disables the Engineer's construction and destruction PDA (not
+// essential with the additional key bindings).
+// You can still bring it up with mouse scroll.
+alias ENGINEER_PDA "pda_off"
+
+// LOADOUT_SWITCH
+// Values: loadout_on | loadout_off
+// If set to loadout_on, the Alt+Num combination will switch to one of four
+// loadouts.
+alias LOADOUT_SWITCH "loadout_on"
+
+// MUSIC_PLAYER
+// Values: music_on | music_off
+// If set to music_on, pressing ";" will cycle through Team Fortress 2's OST.
+alias MUSIC_PLAYER "music_on"
+
+// MUSIC_PLAYER_CLASSES
+// Values: music_classes_on | music_classes_off
+// If set to music_class_on, selecting a class for the first time during a game
+// session will play that class' associated music, usually taken from the Meet
+// the Team videos.
+alias MUSIC_PLAYER_CLASSES "music_classes_off"
+
+// SHOW_NETGRAPH
+// Values: netgraph_on | netgraph_off
+// Shows the netgraph when the user press Tab.
+alias SHOW_NETGRAPH "netgraph_off"
+
+// SOLDIER_ROCKET_JUMP
+// Values: rocket_on | rocket_off
+// If set to rocket_on, pressing MOUSE3 as a Soldier will make the player
+// rocket jump.
+alias SOLDIER_ROCKET_JUMP "rocket_on"
+
+// SPY_LINES
+// Values: spy_lines_on | spy_lines_off
+// If set to spy_lines_on, the Shift+Num combination will say a line
+// naming the class which has been spotted.
+alias SPY_LINES "spy_lines_on"
+
+// SPY_TAUNT
+// Values: spy_taunt_on | spy_taunt_off
+// If set to spy_taunt_on, pressing G will un-disguise the Spy and make him
+// perform a taunt. Press G twice to ensure that the taunt is always performed.
+alias SPY_TAUNT "spy_taunt_on"
+
+// SUICIDE_EXPLOSION
+// Values: suicide_on | suicide_off
+// If set to suicide_on, pressing F1 will make the player explode.
+alias SUICIDE_EXPLOSION "suicide_on"
\ No newline at end of file
diff --git a/cfg/autoexec.cfg b/cfg/autoexec.cfg
index 5a5a6a4..0e522a5 100644
--- a/cfg/autoexec.cfg
+++ b/cfg/autoexec.cfg
@@ -1 +1,136 @@
-exec scripts/main.cfg
\ No newline at end of file
+// TF2 Scripts v1.1
+// Provides utility scripts for all TF2 classes.
+
+// Create an empty alias, to "unbind" aliases.
+alias empty ""
+
+exec _settings.cfg
+exec _lang.cfg
+exec _reset.cfg
+
+
+// Debug Output
+// Bind the debug output to a key.
+con_notifytime 4  // If you want the debug text to last longer, change this setting.
+alias cft_clear con_filter_clear_text
+alias cft_script "con_filter_text |"
+alias hide_output "developer 0; cft_clear; con_filter_enable 0; alias toggle_output show_output"
+alias show_output "clear; developer 1; cft_script; con_filter_enable 1; show_debug_output_text; alias toggle_output hide_output"
+alias toggle_output show_output
+bind P toggle_output
+DEBUG_OUTPUT_ON_START
+
+
+// Auto Crouch-Jump
+// Makes the player automatically crouch-jump when holding down the spacebar.
+alias +crouch_jump "+jump; +duck"
+alias -crouch_jump "-duck; -jump"
+alias crouch_on "bind SPACE +crouch_jump"
+alias crouch_off "bind SPACE +jump"
+AUTO_CROUCH_JUMP
+
+
+// Clears the console, we don't care about anything that was displayed before.
+alias clear_on "clear"
+alias clear_off ""
+CLEAR_CONSOLE_ON_START
+
+
+// Loadout Switch
+// Alt+1 switches to loadout A, Alt+2 switches to loadout B and so on.
+alias +switching_loadout "+loadout_A; +loadout_B; +loadout_C; +loadout_D"
+alias -switching_loadout "-loadout_A; -loadout_B; -loadout_C; -loadout_D"
+alias switch_loadout_A "load_itempreset 0; switch_loadout_A_text"
+alias switch_loadout_B "load_itempreset 1; switch_loadout_B_text"
+alias switch_loadout_C "load_itempreset 2; switch_loadout_C_text"
+alias switch_loadout_D "load_itempreset 3; switch_loadout_D_text"
+alias +loadout_A "bind 1 switch_loadout_A"; alias -loadout_A "bind 1 key1"
+alias +loadout_B "bind 2 switch_loadout_B"; alias -loadout_B "bind 2 key2"
+alias +loadout_C "bind 3 switch_loadout_C"; alias -loadout_C "bind 3 key3"
+alias +loadout_D "bind 4 switch_loadout_D"; alias -loadout_D "bind 4 key4"
+alias loadout_on "bind ALT +switching_loadout"
+alias loadout_off "bind ALT +strafe"
+LOADOUT_SWITCH
+
+
+// Music Player
+// Lets the user play music from his music folder.
+alias music_1 "play /ui/gamestartup1.mp3; music_1_text; alias next_music music_2"
+alias music_2 "play /ui/gamestartup2.mp3; music_2_text; alias next_music music_3"
+alias music_3 "play /ui/gamestartup3.mp3; music_3_text; alias next_music music_4"
+alias music_4 "play /ui/gamestartup4.mp3; music_4_text; alias next_music music_5"
+alias music_5 "play /ui/gamestartup5.mp3; music_5_text; alias next_music music_6"
+alias music_6 "play /ui/gamestartup6.mp3; music_6_text; alias next_music music_7"
+alias music_7 "play /ui/gamestartup7.mp3; music_7_text; alias next_music music_8"
+alias music_8 "play /ui/gamestartup8.mp3; music_8_text; alias next_music music_9"
+alias music_9 "play /ui/gamestartup9.mp3; music_9_text; alias next_music music_10"
+alias music_10 "play /ui/gamestartup10.mp3; music_10_text; alias next_music music_11"
+alias music_11 "play /ui/gamestartup11.mp3; music_11_text; alias next_music music_12"
+alias music_12 "play /ui/gamestartup12.mp3; music_12_text; alias next_music music_13"
+alias music_13 "play /ui/gamestartup13.mp3; music_13_text; alias next_music music_14"
+alias music_14 "play /ui/gamestartup14.mp3; music_14_text; alias next_music music_15"
+alias music_15 "play /ui/gamestartup15.mp3; music_15_text; alias next_music music_16"
+alias music_16 "play /ui/gamestartup16.mp3; music_16_text; alias next_music music_17"
+alias music_17 "play /ui/holiday/gamestartup_saxxy.mp3; music_17_text; alias next_music music_18"
+alias music_18 "play /ui/holiday/gamestartup_halloween.mp3; music_18_text; alias next_music music_19"
+alias music_19 "play /items/tf_music_upgrade_machine.wav; music_19_text; alias next_music music_1"
+alias next_music "music_1"
+alias music_on "bind SEMICOLON next_music"
+alias music_off "unbind SEMICOLON"
+MUSIC_PLAYER
+
+
+// Music Player - Classes
+// Plays the classes' music once.
+alias demoman_music_on "music_9; alias demoman_music empty"
+alias engineer_music_on "music_10; alias engineer_music empty"
+alias heavyweapons_music_on "music_2; alias heavyweapons_music empty"
+alias medic_music_on "music_12; alias medic_music empty"
+alias pyro_music_on "music_14; alias pyro_music empty"
+alias scout_music_on "music_5; alias scout_music empty"
+alias sniper_music_on "music_8; alias sniper_music empty"
+alias soldier_music_on "music_4; alias soldier_music empty"
+alias spy_music_on "music_7; alias spy_music empty"
+alias music_classes_on "alias demoman_music demoman_music_on; alias engineer_music engineer_music_on; alias heavyweapons_music heavyweapons_music_on; alias medic_music medic_music_on; alias pyro_music pyro_music_on; alias scout_music scout_music_on; alias sniper_music sniper_music_on; alias soldier_music soldier_music_on; alias spy_music spy_music_on"
+alias music_classes_off "alias demoman_music empty; alias engineer_music empty; alias heavyweapons_music empty; alias medic_music empty; alias pyro_music empty; alias scout_music empty; alias sniper_music empty; alias soldier_music empty; alias spy_music empty;"
+MUSIC_PLAYER_CLASSES
+
+
+// Netgraph
+// Shows the netgraph when the user press Tab.
+net_graphpos 2
+alias +showscores_netgraph "+showscores; net_graph 4"
+alias -showscores_netgraph "-showscores; net_graph 0"
+alias netgraph_on "bind TAB +showscores_netgraph"
+alias netgraph_off "bind TAB +showscores"
+SHOW_NETGRAPH
+
+
+// Pyro Airblast Call
+// Sends a team message asking for a Pyro to airblast you.
+bind BACKSPACE pyro_airblast_text
+
+// Spy-Checking Lines
+// Automatically says a spy-checking team chat line.
+alias +spy_mode "+spy1; +spy2; +spy3; +spy4; +spy5; +spy6; +spy7; +spy8; +spy9"
+alias -spy_mode "-spy1; -spy2; -spy3; -spy4; -spy5; -spy6; -spy7; -spy8; -spy9"
+alias +spy1 "bind 1 spy_check_scout_text"; alias -spy1 "bind 1 key1"
+alias +spy2 "bind 2 spy_check_soldier_text"; alias -spy2 "bind 2 key2"
+alias +spy3 "bind 3 spy_check_pyro_text"; alias -spy3 "bind 3 key3"
+alias +spy4 "bind 4 spy_check_demoman_text"; alias -spy4 "bind 4 key4"
+alias +spy5 "bind 5 spy_check_heavy_text"; alias -spy5 "bind 5 key5"
+alias +spy6 "bind 6 spy_check_engineer_text"; alias -spy6 "bind 6 key6"
+alias +spy7 "bind 7 spy_check_medic_text"; alias -spy7 "bind 7 key7"
+alias +spy8 "bind 8 spy_check_sniper_text"; alias -spy8 "bind 8 key8"
+alias +spy9 "bind 9 spy_check_spy_text"; alias -spy9 "bind 9 key9"
+alias spy_lines_on "bind SHIFT +spy_mode"
+alias spy_lines_off "unbind SHIFT"
+SPY_LINES
+
+
+// Suicide Explosion
+// To be used when the player is cornered and with no chance of escape.
+// Go out with a bang!
+alias suicide_on "bind F1 explode
+alias suicide_off "unbind F1"
+SUICIDE_EXPLOSION
\ No newline at end of file
diff --git a/cfg/demoman.cfg b/cfg/demoman.cfg
index 04940a3..289f535 100644
--- a/cfg/demoman.cfg
+++ b/cfg/demoman.cfg
@@ -1 +1,7 @@
-exec scripts/classes/demoman.cfg
\ No newline at end of file
+// Demoman Scripting
+
+exec _reset.cfg
+
+// Demoman Music
+// Plays "Drunken Pipe Bomb" on first class load.
+demoman_music
\ No newline at end of file
diff --git a/cfg/engineer.cfg b/cfg/engineer.cfg
index b3f0fcf..feb80cd 100644
--- a/cfg/engineer.cfg
+++ b/cfg/engineer.cfg
@@ -1 +1,23 @@
-exec scripts/classes/engineer.cfg
\ No newline at end of file
+// Engineer Scripting
+
+exec _reset.cfg
+
+// Engineer Music
+// Plays "More Gun" on first class load.
+engineer_music
+
+
+// Buildings
+// Key 6-9 automatically destroy the associated building if it already exists,
+// then selects the relevant building blueprint, ready to be built.
+alias key6 "destroy 2 0; build 2 0;"  // Sentry Gun
+alias key7 "destroy 0 0; build 0 0;"  // Dispenser
+alias key8 "destroy 1 0; build 1 0;"  // Teleporter Entrance
+alias key9 "destroy 1 1; build 1 1;"  // Teleporter Exit
+
+
+// PDA
+// Enables or disables the Engineer's PDA.
+alias pda_on "alias key4 slot4; bind 4 key4; alias key5 slot5; bind 5 key5"
+alias pda_off "unbind 4; unbind 5;"
+ENGINEER_PDA
\ No newline at end of file
diff --git a/cfg/heavyweapons.cfg b/cfg/heavyweapons.cfg
index a6814de..47cb9f2 100644
--- a/cfg/heavyweapons.cfg
+++ b/cfg/heavyweapons.cfg
@@ -1 +1,7 @@
-exec scripts/classes/heavyweapons.cfg
\ No newline at end of file
+// Heavy Scripting
+
+exec _reset.cfg
+
+// Heavy Music
+// Plays "Playing With Danger" on first class load.
+heavyweapons_music
\ No newline at end of file
diff --git a/cfg/lang/auto_disguise_off_text.cfg b/cfg/lang/auto_disguise_off_text.cfg
new file mode 100644
index 0000000..71a2960
--- /dev/null
+++ b/cfg/lang/auto_disguise_off_text.cfg
@@ -0,0 +1 @@
+echo "| Automatic Disguise: OFF"
\ No newline at end of file
diff --git a/cfg/lang/auto_disguise_on_text.cfg b/cfg/lang/auto_disguise_on_text.cfg
new file mode 100644
index 0000000..420f4ca
--- /dev/null
+++ b/cfg/lang/auto_disguise_on_text.cfg
@@ -0,0 +1 @@
+echo "| Automatic Disguise: ON"
\ No newline at end of file
diff --git a/cfg/lang/con_filter_clear_text.cfg b/cfg/lang/con_filter_clear_text.cfg
new file mode 100644
index 0000000..7f48fe5
--- /dev/null
+++ b/cfg/lang/con_filter_clear_text.cfg
@@ -0,0 +1,3 @@
+// Console Workaround File
+// Used to work around a limitation of the console.
+con_filter_text ""
\ No newline at end of file
diff --git a/cfg/lang/disguise_demoman_text.cfg b/cfg/lang/disguise_demoman_text.cfg
new file mode 100644
index 0000000..3f14956
--- /dev/null
+++ b/cfg/lang/disguise_demoman_text.cfg
@@ -0,0 +1 @@
+echo "| Disguising as Demoman."
\ No newline at end of file
diff --git a/cfg/lang/disguise_engineer_text.cfg b/cfg/lang/disguise_engineer_text.cfg
new file mode 100644
index 0000000..0257142
--- /dev/null
+++ b/cfg/lang/disguise_engineer_text.cfg
@@ -0,0 +1 @@
+echo "| Disguising as Engineer."
\ No newline at end of file
diff --git a/cfg/lang/disguise_pyro_text.cfg b/cfg/lang/disguise_pyro_text.cfg
new file mode 100644
index 0000000..a7d72e0
--- /dev/null
+++ b/cfg/lang/disguise_pyro_text.cfg
@@ -0,0 +1 @@
+echo "| Disguising as Pyro."
\ No newline at end of file
diff --git a/cfg/lang/disguise_remove_text.cfg b/cfg/lang/disguise_remove_text.cfg
new file mode 100644
index 0000000..4302d07
--- /dev/null
+++ b/cfg/lang/disguise_remove_text.cfg
@@ -0,0 +1 @@
+echo "| Removing disguise."
\ No newline at end of file
diff --git a/cfg/lang/disguise_sniper_text.cfg b/cfg/lang/disguise_sniper_text.cfg
new file mode 100644
index 0000000..05e6e64
--- /dev/null
+++ b/cfg/lang/disguise_sniper_text.cfg
@@ -0,0 +1 @@
+echo "| Disguising as Sniper."
\ No newline at end of file
diff --git a/cfg/lang/music_10_text.cfg b/cfg/lang/music_10_text.cfg
new file mode 100644
index 0000000..2908ff4
--- /dev/null
+++ b/cfg/lang/music_10_text.cfg
@@ -0,0 +1 @@
+echo "| Currently Playing: More Gun"
\ No newline at end of file
diff --git a/cfg/lang/music_11_text.cfg b/cfg/lang/music_11_text.cfg
new file mode 100644
index 0000000..8693050
--- /dev/null
+++ b/cfg/lang/music_11_text.cfg
@@ -0,0 +1 @@
+echo "| Currently Playing: A Little Heart to Heart"
\ No newline at end of file
diff --git a/cfg/lang/music_12_text.cfg b/cfg/lang/music_12_text.cfg
new file mode 100644
index 0000000..a4534ab
--- /dev/null
+++ b/cfg/lang/music_12_text.cfg
@@ -0,0 +1 @@
+echo "| Currently Playing: MEDIC!"
\ No newline at end of file
diff --git a/cfg/lang/music_13_text.cfg b/cfg/lang/music_13_text.cfg
new file mode 100644
index 0000000..60c140c
--- /dev/null
+++ b/cfg/lang/music_13_text.cfg
@@ -0,0 +1 @@
+echo "| Currently Playing: Archimedes"
\ No newline at end of file
diff --git a/cfg/lang/music_14_text.cfg b/cfg/lang/music_14_text.cfg
new file mode 100644
index 0000000..5d2e0ca
--- /dev/null
+++ b/cfg/lang/music_14_text.cfg
@@ -0,0 +1 @@
+echo "| Currently Playing: Dreams of Cruelty"
\ No newline at end of file
diff --git a/cfg/lang/music_15_text.cfg b/cfg/lang/music_15_text.cfg
new file mode 100644
index 0000000..8cfba5c
--- /dev/null
+++ b/cfg/lang/music_15_text.cfg
@@ -0,0 +1 @@
+echo "| Currently Playing: The Calm"
\ No newline at end of file
diff --git a/cfg/lang/music_16_text.cfg b/cfg/lang/music_16_text.cfg
new file mode 100644
index 0000000..66e4b85
--- /dev/null
+++ b/cfg/lang/music_16_text.cfg
@@ -0,0 +1 @@
+echo "| Currently Playing: ROBOTS!"
\ No newline at end of file
diff --git a/cfg/lang/music_17_text.cfg b/cfg/lang/music_17_text.cfg
new file mode 100644
index 0000000..9fbacc6
--- /dev/null
+++ b/cfg/lang/music_17_text.cfg
@@ -0,0 +1 @@
+echo "| Currently Playing: TF2 Saxxy 2011 Theme"
\ No newline at end of file
diff --git a/cfg/lang/music_18_text.cfg b/cfg/lang/music_18_text.cfg
new file mode 100644
index 0000000..6515864
--- /dev/null
+++ b/cfg/lang/music_18_text.cfg
@@ -0,0 +1 @@
+echo "| Currently Playing: Haunted Fortress 2"
\ No newline at end of file
diff --git a/cfg/lang/music_19_text.cfg b/cfg/lang/music_19_text.cfg
new file mode 100644
index 0000000..907281d
--- /dev/null
+++ b/cfg/lang/music_19_text.cfg
@@ -0,0 +1 @@
+echo "| Currently Playing: Mann vs. Machine Upgrade Station Music (Unused)"
\ No newline at end of file
diff --git a/cfg/lang/music_1_text.cfg b/cfg/lang/music_1_text.cfg
new file mode 100644
index 0000000..7010522
--- /dev/null
+++ b/cfg/lang/music_1_text.cfg
@@ -0,0 +1 @@
+echo "| Currently Playing: Team Fortress 2 (Main Theme)"
\ No newline at end of file
diff --git a/cfg/lang/music_2_text.cfg b/cfg/lang/music_2_text.cfg
new file mode 100644
index 0000000..b5baaa7
--- /dev/null
+++ b/cfg/lang/music_2_text.cfg
@@ -0,0 +1 @@
+echo "| Currently Playing: Playing With Danger"
\ No newline at end of file
diff --git a/cfg/lang/music_3_text.cfg b/cfg/lang/music_3_text.cfg
new file mode 100644
index 0000000..9d7b9f0
--- /dev/null
+++ b/cfg/lang/music_3_text.cfg
@@ -0,0 +1 @@
+echo "| Currently Playing: Rocket Jump Waltz"
\ No newline at end of file
diff --git a/cfg/lang/music_4_text.cfg b/cfg/lang/music_4_text.cfg
new file mode 100644
index 0000000..2cde2fb
--- /dev/null
+++ b/cfg/lang/music_4_text.cfg
@@ -0,0 +1 @@
+echo "| Currently Playing: The Art of War"
\ No newline at end of file
diff --git a/cfg/lang/music_5_text.cfg b/cfg/lang/music_5_text.cfg
new file mode 100644
index 0000000..44af4f8
--- /dev/null
+++ b/cfg/lang/music_5_text.cfg
@@ -0,0 +1 @@
+echo "| Currently Playing: Faster Than a Speeding Bullet"
\ No newline at end of file
diff --git a/cfg/lang/music_6_text.cfg b/cfg/lang/music_6_text.cfg
new file mode 100644
index 0000000..1985006
--- /dev/null
+++ b/cfg/lang/music_6_text.cfg
@@ -0,0 +1 @@
+echo "| Currently Playing: Petite Chou-Fleur"
\ No newline at end of file
diff --git a/cfg/lang/music_7_text.cfg b/cfg/lang/music_7_text.cfg
new file mode 100644
index 0000000..d1709e0
--- /dev/null
+++ b/cfg/lang/music_7_text.cfg
@@ -0,0 +1 @@
+echo "| Currently Playing: Right Behind You"
\ No newline at end of file
diff --git a/cfg/lang/music_8_text.cfg b/cfg/lang/music_8_text.cfg
new file mode 100644
index 0000000..0f754a2
--- /dev/null
+++ b/cfg/lang/music_8_text.cfg
@@ -0,0 +1 @@
+echo "| Currently Playing: Intruder Alert"
\ No newline at end of file
diff --git a/cfg/lang/music_9_text.cfg b/cfg/lang/music_9_text.cfg
new file mode 100644
index 0000000..cccfdd1
--- /dev/null
+++ b/cfg/lang/music_9_text.cfg
@@ -0,0 +1 @@
+echo "| Currently Playing: Drunken Pipe Bomb"
\ No newline at end of file
diff --git a/cfg/lang/pyro_airblast_text.cfg b/cfg/lang/pyro_airblast_text.cfg
new file mode 100644
index 0000000..18b336e
--- /dev/null
+++ b/cfg/lang/pyro_airblast_text.cfg
@@ -0,0 +1 @@
+say_team "Pyro, please airblast me."
\ No newline at end of file
diff --git a/cfg/lang/show_debug_output_text.cfg b/cfg/lang/show_debug_output_text.cfg
new file mode 100644
index 0000000..195289c
--- /dev/null
+++ b/cfg/lang/show_debug_output_text.cfg
@@ -0,0 +1 @@
+echo "| Showing debug output."
\ No newline at end of file
diff --git a/cfg/lang/spy_check_demoman_text.cfg b/cfg/lang/spy_check_demoman_text.cfg
new file mode 100644
index 0000000..27fb001
--- /dev/null
+++ b/cfg/lang/spy_check_demoman_text.cfg
@@ -0,0 +1 @@
+say_team "Demoman is Spy."
\ No newline at end of file
diff --git a/cfg/lang/spy_check_engineer_text.cfg b/cfg/lang/spy_check_engineer_text.cfg
new file mode 100644
index 0000000..f20775e
--- /dev/null
+++ b/cfg/lang/spy_check_engineer_text.cfg
@@ -0,0 +1 @@
+say_team "Engineer is Spy."
\ No newline at end of file
diff --git a/cfg/lang/spy_check_heavy_text.cfg b/cfg/lang/spy_check_heavy_text.cfg
new file mode 100644
index 0000000..9324976
--- /dev/null
+++ b/cfg/lang/spy_check_heavy_text.cfg
@@ -0,0 +1 @@
+say_team "Heavy is Spy."
\ No newline at end of file
diff --git a/cfg/lang/spy_check_medic_text.cfg b/cfg/lang/spy_check_medic_text.cfg
new file mode 100644
index 0000000..0c76717
--- /dev/null
+++ b/cfg/lang/spy_check_medic_text.cfg
@@ -0,0 +1 @@
+say_team "Medic is Spy."
\ No newline at end of file
diff --git a/cfg/lang/spy_check_pyro_text.cfg b/cfg/lang/spy_check_pyro_text.cfg
new file mode 100644
index 0000000..8880e0d
--- /dev/null
+++ b/cfg/lang/spy_check_pyro_text.cfg
@@ -0,0 +1 @@
+say_team "Pyro is Spy."
\ No newline at end of file
diff --git a/cfg/lang/spy_check_scout_text.cfg b/cfg/lang/spy_check_scout_text.cfg
new file mode 100644
index 0000000..15f3e0e
--- /dev/null
+++ b/cfg/lang/spy_check_scout_text.cfg
@@ -0,0 +1 @@
+say_team "Scout is Spy."
\ No newline at end of file
diff --git a/cfg/lang/spy_check_sniper_text.cfg b/cfg/lang/spy_check_sniper_text.cfg
new file mode 100644
index 0000000..9ed1666
--- /dev/null
+++ b/cfg/lang/spy_check_sniper_text.cfg
@@ -0,0 +1 @@
+say_team "Sniper is Spy."
\ No newline at end of file
diff --git a/cfg/lang/spy_check_soldier_text.cfg b/cfg/lang/spy_check_soldier_text.cfg
new file mode 100644
index 0000000..19bce6b
--- /dev/null
+++ b/cfg/lang/spy_check_soldier_text.cfg
@@ -0,0 +1 @@
+say_team "Soldier is Spy."
\ No newline at end of file
diff --git a/cfg/lang/spy_check_spy_text.cfg b/cfg/lang/spy_check_spy_text.cfg
new file mode 100644
index 0000000..a0180a4
--- /dev/null
+++ b/cfg/lang/spy_check_spy_text.cfg
@@ -0,0 +1 @@
+say_team "Spy is enemy Spy."
\ No newline at end of file
diff --git a/cfg/lang/switch_loadout_A_text.cfg b/cfg/lang/switch_loadout_A_text.cfg
new file mode 100644
index 0000000..ed59492
--- /dev/null
+++ b/cfg/lang/switch_loadout_A_text.cfg
@@ -0,0 +1 @@
+echo "| Switching to loadout A."
\ No newline at end of file
diff --git a/cfg/lang/switch_loadout_B_text.cfg b/cfg/lang/switch_loadout_B_text.cfg
new file mode 100644
index 0000000..cc897e1
--- /dev/null
+++ b/cfg/lang/switch_loadout_B_text.cfg
@@ -0,0 +1 @@
+echo "| Switching to loadout B."
\ No newline at end of file
diff --git a/cfg/lang/switch_loadout_C_text.cfg b/cfg/lang/switch_loadout_C_text.cfg
new file mode 100644
index 0000000..b5c6b4d
--- /dev/null
+++ b/cfg/lang/switch_loadout_C_text.cfg
@@ -0,0 +1 @@
+echo "| Switching to loadout C."
\ No newline at end of file
diff --git a/cfg/lang/switch_loadout_D_text.cfg b/cfg/lang/switch_loadout_D_text.cfg
new file mode 100644
index 0000000..31809d9
--- /dev/null
+++ b/cfg/lang/switch_loadout_D_text.cfg
@@ -0,0 +1 @@
+echo "| Switching to loadout D."
\ No newline at end of file
diff --git a/cfg/medic.cfg b/cfg/medic.cfg
index 694702a..e90b96f 100644
--- a/cfg/medic.cfg
+++ b/cfg/medic.cfg
@@ -1 +1,7 @@
-exec scripts/classes/medic.cfg
\ No newline at end of file
+// Medic Scripting
+
+exec _reset.cfg
+
+// Medic Music
+// Plays "MEDIC!" on first class load.
+medic_music
\ No newline at end of file
diff --git a/cfg/pyro.cfg b/cfg/pyro.cfg
index c95d832..d739a1f 100644
--- a/cfg/pyro.cfg
+++ b/cfg/pyro.cfg
@@ -1 +1,7 @@
-exec scripts/classes/pyro.cfg
\ No newline at end of file
+// Pyro Scripting
+
+exec _reset.cfg
+
+// Pyro Music
+// Plays "Dreams of Cruelty" on first class load.
+pyro_music
\ No newline at end of file
diff --git a/cfg/scout.cfg b/cfg/scout.cfg
index bbf06d0..f58eed9 100644
--- a/cfg/scout.cfg
+++ b/cfg/scout.cfg
@@ -1 +1,7 @@
-exec scripts/classes/scout.cfg
\ No newline at end of file
+// Scout Scripting
+
+exec _reset.cfg
+
+// Scout Music
+// Plays "Faster Than a Speeding Bullet" on first class load.
+scout_music
\ No newline at end of file
diff --git a/cfg/sniper.cfg b/cfg/sniper.cfg
index d86bf63..9649b03 100644
--- a/cfg/sniper.cfg
+++ b/cfg/sniper.cfg
@@ -1 +1,7 @@
-exec scripts/classes/sniper.cfg
\ No newline at end of file
+// Sniper Scripting
+
+exec _reset.cfg
+
+// Sniper Music
+// Plays "Intruder Alert" on first class load.
+sniper_music
\ No newline at end of file
diff --git a/cfg/soldier.cfg b/cfg/soldier.cfg
index e2ee886..fe45e08 100644
--- a/cfg/soldier.cfg
+++ b/cfg/soldier.cfg
@@ -1 +1,17 @@
-exec scripts/classes/soldier.cfg
\ No newline at end of file
+// Soldier Scripting
+
+exec _reset.cfg
+
+// Soldier Music
+// Plays "The Art of War" on first class load.
+soldier_music
+
+
+// Rocket Jump
+// A simple rocket jump script. Doesn't achieve the best height, since it
+// doesn't use any wait commands, but it still provides a decent jump.
+alias +rocket_jump "+jump; +duck; +attack"
+alias -rocket_jump "-jump; -duck; -attack"
+alias rocket_on "bind MOUSE3 +rocket_jump"
+alias rocket_off "bind MOUSE3 +attack3"
+SOLDIER_ROCKET_JUMP
\ No newline at end of file
diff --git a/cfg/spy.cfg b/cfg/spy.cfg
index 71671de..78e2bc4 100644
--- a/cfg/spy.cfg
+++ b/cfg/spy.cfg
@@ -1 +1,70 @@
-exec scripts/classes/spy.cfg
\ No newline at end of file
+// Spy Scripting.
+
+exec _settings.cfg
+exec _reset.cfg
+
+// Spy Music
+// Plays "Right Behind You" on first class load.
+spy_music
+
+
+// Taunt
+// Automatically undisguises the spy before performing a taunt.
+// Note: most of the time, removing the disguise will not happen quickly
+// enough. If that is the case, you will be undisguised, but you will not
+// taunt. Therefore, always press G twice in a row to taunt.
+alias +spy_taunt "disguise 8 -2; disguise_remove_text; +taunt"
+alias -spy_taunt "-taunt"
+alias spy_taunt_on "bind G +spy_taunt"
+alias spy_taunt_off "bind G +taunt"
+SPY_TAUNT
+
+// Disguises
+// Keys 5-9 are used to quickly disguise.
+alias key5 "disguise 4 -1; disguise_demoman_text"  // Demoman
+alias key6 "disguise 7 -1; disguise_pyro_text"  // Pyro
+alias key7 "disguise 2 -1; disguise_sniper_text"  // Sniper
+alias key8 "disguise 9 -1; disguise_engineer_text"  // Engineer
+alias key9 "disguise 8 -2; disguise_remove_text"  // Un-disguise
+
+
+// Auto-Disguise After Attack
+// Press F to activate.
+alias disguise1 "disguise 4 -1; disguise_demoman_text; alias next_disguise disguise2"  // Demoman
+alias disguise2 "disguise 7 -1; disguise_pyro_text; alias next_disguise disguise3"  // Pyro
+alias disguise3 "disguise 2 -1; disguise_sniper_text; alias next_disguise disguise4"  // Sniper
+alias disguise4 "disguise 9 -1; disguise_engineer_text; alias next_disguise disguise1"  // Engineer
+alias next_disguise disguise1
+alias +disguise_attack +attack
+alias -disguise_attack "-attack; next_disguise"
+
+
+// Disguised Weapon Switching
+// When switching weapons, the disguise also switches weapons.
+// With some players, this might reduce suspicion that you're a spy.
+// Only works if spy_toggle is set to disguise_on.
+// Note: the scroll wheel will now only scroll between 1 and 3, because once
+// the disguise kit always gets skipped once the last disguise is activated.
+alias reload1 "slot1; lastdisguise"
+alias reload2 "slot2; lastdisguise"
+alias reload3 "slot3; lastdisguise"
+alias reload_m_up "invprev; lastdisguise"
+alias reload_m_down "invnext; lastdisguise"
+alias disguise_weapon_on "alias key1 reload1; alias key2 reload2; alias key3 reload3; bind MWHEELUP reload_m_up; bind MWHEELDOWN reload_m_down"
+alias disguise_weapon_off "alias key1 slot1; alias key2 slot2; alias key3 slot3; bind MWHEELUP invprev; bind MWHEELDOWN invnext"
+
+
+// Disguise Toggling
+// The master switch for all the automatic disguise scripting. Default: on
+alias spy_toggle disguise_off
+alias disguise_on "auto_disguise_on_text; disguise_weapon_on; bind MOUSE1 +disguise_attack; alias spy_toggle disguise_off"
+alias disguise_off "auto_disguise_off_text; disguise_weapon_off; bind MOUSE1 +attack; alias spy_toggle disguise_on"
+bind F spy_toggle
+
+
+// MOUSE3 Attack
+// Bind MOUSE3 to the standard attack, in case the user wants to quickly
+// attack without disguising (for example: sapping a sentry).
+bind MOUSE3 +attack
+
+AUTO_DISGUISE
\ No newline at end of file