diff --git a/configs/shavit-advertisements.cfg b/addons/sourcemod/configs/shavit-advertisements.cfg
similarity index 100%
rename from configs/shavit-advertisements.cfg
rename to addons/sourcemod/configs/shavit-advertisements.cfg
diff --git a/configs/shavit-messages.cfg b/addons/sourcemod/configs/shavit-messages.cfg
similarity index 100%
rename from configs/shavit-messages.cfg
rename to addons/sourcemod/configs/shavit-messages.cfg
diff --git a/configs/shavit-prefix.txt b/addons/sourcemod/configs/shavit-prefix.txt
similarity index 100%
rename from configs/shavit-prefix.txt
rename to addons/sourcemod/configs/shavit-prefix.txt
diff --git a/configs/shavit-readme.txt b/addons/sourcemod/configs/shavit-readme.txt
similarity index 100%
rename from configs/shavit-readme.txt
rename to addons/sourcemod/configs/shavit-readme.txt
diff --git a/configs/shavit-replay.cfg b/addons/sourcemod/configs/shavit-replay.cfg
similarity index 100%
rename from configs/shavit-replay.cfg
rename to addons/sourcemod/configs/shavit-replay.cfg
diff --git a/configs/shavit-sounds.cfg b/addons/sourcemod/configs/shavit-sounds.cfg
similarity index 100%
rename from configs/shavit-sounds.cfg
rename to addons/sourcemod/configs/shavit-sounds.cfg
diff --git a/configs/shavit-styles.cfg b/addons/sourcemod/configs/shavit-styles.cfg
similarity index 100%
rename from configs/shavit-styles.cfg
rename to addons/sourcemod/configs/shavit-styles.cfg
diff --git a/configs/shavit-zones.cfg b/addons/sourcemod/configs/shavit-zones.cfg
similarity index 100%
rename from configs/shavit-zones.cfg
rename to addons/sourcemod/configs/shavit-zones.cfg
diff --git a/gamedata/shavit.games.txt b/addons/sourcemod/gamedata/shavit.games.txt
similarity index 100%
rename from gamedata/shavit.games.txt
rename to addons/sourcemod/gamedata/shavit.games.txt
diff --git a/scripting/include/SteamWorks.inc b/addons/sourcemod/scripting/include/SteamWorks.inc
similarity index 100%
rename from scripting/include/SteamWorks.inc
rename to addons/sourcemod/scripting/include/SteamWorks.inc
diff --git a/scripting/include/bhopstats.inc b/addons/sourcemod/scripting/include/bhopstats.inc
similarity index 100%
rename from scripting/include/bhopstats.inc
rename to addons/sourcemod/scripting/include/bhopstats.inc
diff --git a/scripting/include/chat-processor.inc b/addons/sourcemod/scripting/include/chat-processor.inc
similarity index 100%
rename from scripting/include/chat-processor.inc
rename to addons/sourcemod/scripting/include/chat-processor.inc
diff --git a/scripting/include/dhooks.inc b/addons/sourcemod/scripting/include/dhooks.inc
similarity index 100%
rename from scripting/include/dhooks.inc
rename to addons/sourcemod/scripting/include/dhooks.inc
diff --git a/scripting/include/rtler.inc b/addons/sourcemod/scripting/include/rtler.inc
similarity index 100%
rename from scripting/include/rtler.inc
rename to addons/sourcemod/scripting/include/rtler.inc
diff --git a/scripting/include/shavit.inc b/addons/sourcemod/scripting/include/shavit.inc
similarity index 100%
rename from scripting/include/shavit.inc
rename to addons/sourcemod/scripting/include/shavit.inc
diff --git a/scripting/shavit-chat.sp b/addons/sourcemod/scripting/shavit-chat.sp
similarity index 100%
rename from scripting/shavit-chat.sp
rename to addons/sourcemod/scripting/shavit-chat.sp
diff --git a/scripting/shavit-core.sp b/addons/sourcemod/scripting/shavit-core.sp
similarity index 100%
rename from scripting/shavit-core.sp
rename to addons/sourcemod/scripting/shavit-core.sp
diff --git a/scripting/shavit-hud.sp b/addons/sourcemod/scripting/shavit-hud.sp
similarity index 100%
rename from scripting/shavit-hud.sp
rename to addons/sourcemod/scripting/shavit-hud.sp
diff --git a/scripting/shavit-misc.sp b/addons/sourcemod/scripting/shavit-misc.sp
similarity index 100%
rename from scripting/shavit-misc.sp
rename to addons/sourcemod/scripting/shavit-misc.sp
diff --git a/scripting/shavit-rankings.sp b/addons/sourcemod/scripting/shavit-rankings.sp
similarity index 100%
rename from scripting/shavit-rankings.sp
rename to addons/sourcemod/scripting/shavit-rankings.sp
diff --git a/scripting/shavit-replay.sp b/addons/sourcemod/scripting/shavit-replay.sp
similarity index 100%
rename from scripting/shavit-replay.sp
rename to addons/sourcemod/scripting/shavit-replay.sp
diff --git a/scripting/shavit-sounds.sp b/addons/sourcemod/scripting/shavit-sounds.sp
similarity index 100%
rename from scripting/shavit-sounds.sp
rename to addons/sourcemod/scripting/shavit-sounds.sp
diff --git a/scripting/shavit-stats.sp b/addons/sourcemod/scripting/shavit-stats.sp
similarity index 100%
rename from scripting/shavit-stats.sp
rename to addons/sourcemod/scripting/shavit-stats.sp
diff --git a/scripting/shavit-timelimit.sp b/addons/sourcemod/scripting/shavit-timelimit.sp
similarity index 100%
rename from scripting/shavit-timelimit.sp
rename to addons/sourcemod/scripting/shavit-timelimit.sp
diff --git a/scripting/shavit-wr.sp b/addons/sourcemod/scripting/shavit-wr.sp
similarity index 100%
rename from scripting/shavit-wr.sp
rename to addons/sourcemod/scripting/shavit-wr.sp
diff --git a/scripting/shavit-zones.sp b/addons/sourcemod/scripting/shavit-zones.sp
similarity index 100%
rename from scripting/shavit-zones.sp
rename to addons/sourcemod/scripting/shavit-zones.sp
diff --git a/translations/shavit-chat.phrases.txt b/addons/sourcemod/translations/shavit-chat.phrases.txt
similarity index 100%
rename from translations/shavit-chat.phrases.txt
rename to addons/sourcemod/translations/shavit-chat.phrases.txt
diff --git a/translations/shavit-common.phrases.txt b/addons/sourcemod/translations/shavit-common.phrases.txt
similarity index 100%
rename from translations/shavit-common.phrases.txt
rename to addons/sourcemod/translations/shavit-common.phrases.txt
diff --git a/translations/shavit-core.phrases.txt b/addons/sourcemod/translations/shavit-core.phrases.txt
similarity index 100%
rename from translations/shavit-core.phrases.txt
rename to addons/sourcemod/translations/shavit-core.phrases.txt
diff --git a/translations/shavit-hud.phrases.txt b/addons/sourcemod/translations/shavit-hud.phrases.txt
similarity index 100%
rename from translations/shavit-hud.phrases.txt
rename to addons/sourcemod/translations/shavit-hud.phrases.txt
diff --git a/translations/shavit-misc.phrases.txt b/addons/sourcemod/translations/shavit-misc.phrases.txt
similarity index 100%
rename from translations/shavit-misc.phrases.txt
rename to addons/sourcemod/translations/shavit-misc.phrases.txt
diff --git a/translations/shavit-rankings.phrases.txt b/addons/sourcemod/translations/shavit-rankings.phrases.txt
similarity index 100%
rename from translations/shavit-rankings.phrases.txt
rename to addons/sourcemod/translations/shavit-rankings.phrases.txt
diff --git a/translations/shavit-replay.phrases.txt b/addons/sourcemod/translations/shavit-replay.phrases.txt
similarity index 100%
rename from translations/shavit-replay.phrases.txt
rename to addons/sourcemod/translations/shavit-replay.phrases.txt
diff --git a/translations/shavit-stats.phrases.txt b/addons/sourcemod/translations/shavit-stats.phrases.txt
similarity index 100%
rename from translations/shavit-stats.phrases.txt
rename to addons/sourcemod/translations/shavit-stats.phrases.txt
diff --git a/translations/shavit-wr.phrases.txt b/addons/sourcemod/translations/shavit-wr.phrases.txt
similarity index 100%
rename from translations/shavit-wr.phrases.txt
rename to addons/sourcemod/translations/shavit-wr.phrases.txt
diff --git a/translations/shavit-zones.phrases.txt b/addons/sourcemod/translations/shavit-zones.phrases.txt
similarity index 100%
rename from translations/shavit-zones.phrases.txt
rename to addons/sourcemod/translations/shavit-zones.phrases.txt