diff --git a/Dockerfile b/Dockerfile
index 0d511b5..3e9a361 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,45 +1,60 @@
+# Use the latest version of Ubuntu as the base image
 FROM ubuntu:latest
 
-# Update base image and install dependencies.
-RUN dpkg --add-architecture i386
-RUN apt-get update && apt-get install -y --no-install-recommends curl file libc6:i386 lib32stdc++6 ca-certificates
-RUN rm -rf /var/lib/apt/lists/*
+# Define variables for the username and volume directory
+ENV USERNAME=steam
+ENV VOLUME_DIR=src
 
-# Create steam user and group
-RUN groupadd -r steam && useradd -r -g steam -m -d /opt/steam steam
+# Update the base image and install dependencies
+RUN dpkg --add-architecture i386 && \
+    apt-get update && \
+    apt-get install -y --no-install-recommends curl file libc6:i386 lib32stdc++6 ca-certificates && \
+    rm -rf /var/lib/apt/lists/*
 
-# Create game directory
-RUN mkdir /gamedir
+# Create a user and group for Steam
+RUN groupadd -r $USERNAME && \
+    useradd -r -g $USERNAME -m -d /opt/$USERNAME $USERNAME
 
-USER steam
-WORKDIR /opt/steam
-COPY ./hldm.install /opt/steam
+# Create a directory for the game using the VOLUME_DIR variable
+RUN mkdir /$VOLUME_DIR
 
-# Download SteamCMD and install HLDM.
-RUN curl -v -sL media.steampowered.com/client/installer/steamcmd_linux.tar.gz | tar xzvf -
-RUN file /opt/steam/linux32/steamcmd && ./steamcmd.sh +runscript hldm.install
+# Switch to the Steam user
+USER $USERNAME
 
-# Fix error that steamclient.so is missing.
-RUN mkdir -p $HOME/.steam \
-    && ln -s /opt/steam/linux32 $HOME/.steam/sdk32 \
-    && echo 70 > /opt/steam/hldm/steam_appid.txt
+# Set the working directory
+WORKDIR /opt/$USERNAME
 
-WORKDIR /opt/steam/hldm
+# Copy the installation script for HLDM
+COPY ./hldm.install /opt/$USERNAME
 
-# Copy configs, Metamod, Stripper2 and AMX.
-COPY --chown=steam:steam gamedir valve
-COPY --chown=steam:steam ./entrypoint.sh ./entrypoint.sh
+# Download SteamCMD and install HLDM
+RUN curl -v -sL media.steampowered.com/client/installer/steamcmd_linux.tar.gz | tar xzvf - && \
+    file /opt/$USERNAME/linux32/steamcmd && \
+    ./steamcmd.sh +runscript hldm.install
 
+# Fix the error that steamclient.so is missing
+RUN mkdir -p $HOME/.steam && \
+    ln -s /opt/$USERNAME/linux32 $HOME/.steam/sdk32 && \
+    echo 70 > /opt/$USERNAME/hldm/steam_appid.txt
+
+# Set the working directory for HLDM
+WORKDIR /opt/$USERNAME/hldm
+
+# Copy configs, Metamod, Stripper2, and AMX
+COPY --chown=$USERNAME:$USERNAME $VOLUME_DIR valve
+COPY --chown=$USERNAME:$USERNAME ./entrypoint.sh ./entrypoint.sh
+
+# Expose the necessary ports
 EXPOSE 27015
 EXPOSE 27015/udp
 
-# Start server.
+# Set the entrypoint for the server
 ENTRYPOINT ["./entrypoint.sh", "-timeout 3"]
 
-# Default start parameters.
+# Set the default start parameters
 CMD ["+maxplayers 12", "+map crossfire"]
 
-# Labels
+# Set labels for the image
 LABEL vendor=steamcalculator.com \
     hldm.docker.version="$VERSION" \
     hldm.docker.release-date="$RELEASE_DATE"
\ No newline at end of file
diff --git a/Dockerfile2 b/Dockerfile2
deleted file mode 100644
index 617164f..0000000
--- a/Dockerfile2
+++ /dev/null
@@ -1,52 +0,0 @@
-FROM debian:bullseye-slim
-
-# Update base image and install dependencies.
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    ca-certificates \
-    curl \
-    file \
-    rsync \
-    libc6:i386 \
-    && rm -rf /var/lib/apt/lists/* \
-    && groupadd -r steam && useradd -r -g steam -m -d /opt/steam steam \
-    && mkdir /gamedir
-
-USER steam
-WORKDIR /opt/steam
-COPY ./hldm.install /opt/steam
-
-# Download SteamCMD and install HLDM.
-# Download SteamCMD and install HLDM.
-RUN curl -v -sL media.steampowered.com/client/installer/steamcmd_linux.tar.gz | tar xzvf - \
-    && ls -l /opt/steam/linux32 \
-    && file /opt/steam/linux32/steamcmd \
-    && ls -l /opt/steam \
-    && ./steamcmd.sh +runscript hldm.install \
-    && rm -fr /opt/steam/hldm/cstrike \
-    && rm -fr /opt/steam/hldm/siteserverui \
-    && rm -fr /opt/steam/hldm/linux64
-
-# Fix error that steamclient.so is missing.
-RUN mkdir -p $HOME/.steam \
-    && ln -s /opt/steam/linux32 $HOME/.steam/sdk32 \
-    && echo 70 > /opt/steam/hldm/steam_appid.txt
-
-WORKDIR /opt/steam/hldm
-
-# Copy configs, Metamod, Stripper2 and AMX.
-COPY --chown=steam:steam gamedir valve
-COPY --chown=steam:steam ./entrypoint.sh ./entrypoint.sh
-
-EXPOSE 27015
-EXPOSE 27015/udp
-
-# Start server.
-ENTRYPOINT ["./entrypoint.sh", "-timeout 3"]
-
-# Default start parameters.
-CMD ["+maxplayers 12", "+map crossfire"]
-
-# Labels
-LABEL vendor=steamcalculator.com \
-    hldm.docker.version="$VERSION" \
-    hldm.docker.release-date="$RELEASE_DATE"
\ No newline at end of file
diff --git a/gamedir/addons/amxmodx/configs/amxx.cfg b/src/addons/amxmodx/configs/amxx.cfg
similarity index 100%
rename from gamedir/addons/amxmodx/configs/amxx.cfg
rename to src/addons/amxmodx/configs/amxx.cfg
diff --git a/gamedir/addons/amxmodx/configs/clcmds.ini b/src/addons/amxmodx/configs/clcmds.ini
similarity index 100%
rename from gamedir/addons/amxmodx/configs/clcmds.ini
rename to src/addons/amxmodx/configs/clcmds.ini
diff --git a/gamedir/addons/amxmodx/configs/cmds.ini b/src/addons/amxmodx/configs/cmds.ini
similarity index 100%
rename from gamedir/addons/amxmodx/configs/cmds.ini
rename to src/addons/amxmodx/configs/cmds.ini
diff --git a/gamedir/addons/amxmodx/configs/configs.ini b/src/addons/amxmodx/configs/configs.ini
similarity index 100%
rename from gamedir/addons/amxmodx/configs/configs.ini
rename to src/addons/amxmodx/configs/configs.ini
diff --git a/gamedir/addons/amxmodx/configs/core.ini b/src/addons/amxmodx/configs/core.ini
similarity index 100%
rename from gamedir/addons/amxmodx/configs/core.ini
rename to src/addons/amxmodx/configs/core.ini
diff --git a/gamedir/addons/amxmodx/configs/custommenuitems.cfg b/src/addons/amxmodx/configs/custommenuitems.cfg
similarity index 100%
rename from gamedir/addons/amxmodx/configs/custommenuitems.cfg
rename to src/addons/amxmodx/configs/custommenuitems.cfg
diff --git a/gamedir/addons/amxmodx/configs/cvars.ini b/src/addons/amxmodx/configs/cvars.ini
similarity index 100%
rename from gamedir/addons/amxmodx/configs/cvars.ini
rename to src/addons/amxmodx/configs/cvars.ini
diff --git a/gamedir/addons/amxmodx/configs/hamdata.ini b/src/addons/amxmodx/configs/hamdata.ini
similarity index 100%
rename from gamedir/addons/amxmodx/configs/hamdata.ini
rename to src/addons/amxmodx/configs/hamdata.ini
diff --git a/gamedir/addons/amxmodx/configs/maps.ini b/src/addons/amxmodx/configs/maps.ini
similarity index 100%
rename from gamedir/addons/amxmodx/configs/maps.ini
rename to src/addons/amxmodx/configs/maps.ini
diff --git a/gamedir/addons/amxmodx/configs/modules.ini b/src/addons/amxmodx/configs/modules.ini
similarity index 100%
rename from gamedir/addons/amxmodx/configs/modules.ini
rename to src/addons/amxmodx/configs/modules.ini
diff --git a/gamedir/addons/amxmodx/configs/plugins.ini b/src/addons/amxmodx/configs/plugins.ini
similarity index 100%
rename from gamedir/addons/amxmodx/configs/plugins.ini
rename to src/addons/amxmodx/configs/plugins.ini
diff --git a/gamedir/addons/amxmodx/configs/speech.ini b/src/addons/amxmodx/configs/speech.ini
similarity index 100%
rename from gamedir/addons/amxmodx/configs/speech.ini
rename to src/addons/amxmodx/configs/speech.ini
diff --git a/gamedir/addons/amxmodx/configs/sql.cfg b/src/addons/amxmodx/configs/sql.cfg
similarity index 100%
rename from gamedir/addons/amxmodx/configs/sql.cfg
rename to src/addons/amxmodx/configs/sql.cfg
diff --git a/gamedir/addons/amxmodx/configs/users.ini b/src/addons/amxmodx/configs/users.ini
similarity index 100%
rename from gamedir/addons/amxmodx/configs/users.ini
rename to src/addons/amxmodx/configs/users.ini
diff --git a/gamedir/addons/amxmodx/data/GeoIP.dat b/src/addons/amxmodx/data/GeoIP.dat
similarity index 100%
rename from gamedir/addons/amxmodx/data/GeoIP.dat
rename to src/addons/amxmodx/data/GeoIP.dat
diff --git a/gamedir/addons/amxmodx/data/lang/admin.txt b/src/addons/amxmodx/data/lang/admin.txt
similarity index 100%
rename from gamedir/addons/amxmodx/data/lang/admin.txt
rename to src/addons/amxmodx/data/lang/admin.txt
diff --git a/gamedir/addons/amxmodx/data/lang/adminchat.txt b/src/addons/amxmodx/data/lang/adminchat.txt
similarity index 100%
rename from gamedir/addons/amxmodx/data/lang/adminchat.txt
rename to src/addons/amxmodx/data/lang/adminchat.txt
diff --git a/gamedir/addons/amxmodx/data/lang/admincmd.txt b/src/addons/amxmodx/data/lang/admincmd.txt
similarity index 100%
rename from gamedir/addons/amxmodx/data/lang/admincmd.txt
rename to src/addons/amxmodx/data/lang/admincmd.txt
diff --git a/gamedir/addons/amxmodx/data/lang/adminhelp.txt b/src/addons/amxmodx/data/lang/adminhelp.txt
similarity index 100%
rename from gamedir/addons/amxmodx/data/lang/adminhelp.txt
rename to src/addons/amxmodx/data/lang/adminhelp.txt
diff --git a/gamedir/addons/amxmodx/data/lang/adminslots.txt b/src/addons/amxmodx/data/lang/adminslots.txt
similarity index 100%
rename from gamedir/addons/amxmodx/data/lang/adminslots.txt
rename to src/addons/amxmodx/data/lang/adminslots.txt
diff --git a/gamedir/addons/amxmodx/data/lang/adminvote.txt b/src/addons/amxmodx/data/lang/adminvote.txt
similarity index 100%
rename from gamedir/addons/amxmodx/data/lang/adminvote.txt
rename to src/addons/amxmodx/data/lang/adminvote.txt
diff --git a/gamedir/addons/amxmodx/data/lang/antiflood.txt b/src/addons/amxmodx/data/lang/antiflood.txt
similarity index 100%
rename from gamedir/addons/amxmodx/data/lang/antiflood.txt
rename to src/addons/amxmodx/data/lang/antiflood.txt
diff --git a/gamedir/addons/amxmodx/data/lang/cmdmenu.txt b/src/addons/amxmodx/data/lang/cmdmenu.txt
similarity index 100%
rename from gamedir/addons/amxmodx/data/lang/cmdmenu.txt
rename to src/addons/amxmodx/data/lang/cmdmenu.txt
diff --git a/gamedir/addons/amxmodx/data/lang/common.txt b/src/addons/amxmodx/data/lang/common.txt
similarity index 100%
rename from gamedir/addons/amxmodx/data/lang/common.txt
rename to src/addons/amxmodx/data/lang/common.txt
diff --git a/gamedir/addons/amxmodx/data/lang/imessage.txt b/src/addons/amxmodx/data/lang/imessage.txt
similarity index 100%
rename from gamedir/addons/amxmodx/data/lang/imessage.txt
rename to src/addons/amxmodx/data/lang/imessage.txt
diff --git a/gamedir/addons/amxmodx/data/lang/languages.txt b/src/addons/amxmodx/data/lang/languages.txt
similarity index 100%
rename from gamedir/addons/amxmodx/data/lang/languages.txt
rename to src/addons/amxmodx/data/lang/languages.txt
diff --git a/gamedir/addons/amxmodx/data/lang/mapchooser.txt b/src/addons/amxmodx/data/lang/mapchooser.txt
similarity index 100%
rename from gamedir/addons/amxmodx/data/lang/mapchooser.txt
rename to src/addons/amxmodx/data/lang/mapchooser.txt
diff --git a/gamedir/addons/amxmodx/data/lang/mapsmenu.txt b/src/addons/amxmodx/data/lang/mapsmenu.txt
similarity index 100%
rename from gamedir/addons/amxmodx/data/lang/mapsmenu.txt
rename to src/addons/amxmodx/data/lang/mapsmenu.txt
diff --git a/gamedir/addons/amxmodx/data/lang/menufront.txt b/src/addons/amxmodx/data/lang/menufront.txt
similarity index 100%
rename from gamedir/addons/amxmodx/data/lang/menufront.txt
rename to src/addons/amxmodx/data/lang/menufront.txt
diff --git a/gamedir/addons/amxmodx/data/lang/miscstats.txt b/src/addons/amxmodx/data/lang/miscstats.txt
similarity index 100%
rename from gamedir/addons/amxmodx/data/lang/miscstats.txt
rename to src/addons/amxmodx/data/lang/miscstats.txt
diff --git a/gamedir/addons/amxmodx/data/lang/multilingual.txt b/src/addons/amxmodx/data/lang/multilingual.txt
similarity index 100%
rename from gamedir/addons/amxmodx/data/lang/multilingual.txt
rename to src/addons/amxmodx/data/lang/multilingual.txt
diff --git a/gamedir/addons/amxmodx/data/lang/nextmap.txt b/src/addons/amxmodx/data/lang/nextmap.txt
similarity index 100%
rename from gamedir/addons/amxmodx/data/lang/nextmap.txt
rename to src/addons/amxmodx/data/lang/nextmap.txt
diff --git a/gamedir/addons/amxmodx/data/lang/pausecfg.txt b/src/addons/amxmodx/data/lang/pausecfg.txt
similarity index 100%
rename from gamedir/addons/amxmodx/data/lang/pausecfg.txt
rename to src/addons/amxmodx/data/lang/pausecfg.txt
diff --git a/gamedir/addons/amxmodx/data/lang/plmenu.txt b/src/addons/amxmodx/data/lang/plmenu.txt
similarity index 100%
rename from gamedir/addons/amxmodx/data/lang/plmenu.txt
rename to src/addons/amxmodx/data/lang/plmenu.txt
diff --git a/gamedir/addons/amxmodx/data/lang/restmenu.txt b/src/addons/amxmodx/data/lang/restmenu.txt
similarity index 100%
rename from gamedir/addons/amxmodx/data/lang/restmenu.txt
rename to src/addons/amxmodx/data/lang/restmenu.txt
diff --git a/gamedir/addons/amxmodx/data/lang/scrollmsg.txt b/src/addons/amxmodx/data/lang/scrollmsg.txt
similarity index 100%
rename from gamedir/addons/amxmodx/data/lang/scrollmsg.txt
rename to src/addons/amxmodx/data/lang/scrollmsg.txt
diff --git a/gamedir/addons/amxmodx/data/lang/stats_dod.txt b/src/addons/amxmodx/data/lang/stats_dod.txt
similarity index 100%
rename from gamedir/addons/amxmodx/data/lang/stats_dod.txt
rename to src/addons/amxmodx/data/lang/stats_dod.txt
diff --git a/gamedir/addons/amxmodx/data/lang/statscfg.txt b/src/addons/amxmodx/data/lang/statscfg.txt
similarity index 100%
rename from gamedir/addons/amxmodx/data/lang/statscfg.txt
rename to src/addons/amxmodx/data/lang/statscfg.txt
diff --git a/gamedir/addons/amxmodx/data/lang/statsx.txt b/src/addons/amxmodx/data/lang/statsx.txt
similarity index 100%
rename from gamedir/addons/amxmodx/data/lang/statsx.txt
rename to src/addons/amxmodx/data/lang/statsx.txt
diff --git a/gamedir/addons/amxmodx/data/lang/telemenu.txt b/src/addons/amxmodx/data/lang/telemenu.txt
similarity index 100%
rename from gamedir/addons/amxmodx/data/lang/telemenu.txt
rename to src/addons/amxmodx/data/lang/telemenu.txt
diff --git a/gamedir/addons/amxmodx/data/lang/time.txt b/src/addons/amxmodx/data/lang/time.txt
similarity index 100%
rename from gamedir/addons/amxmodx/data/lang/time.txt
rename to src/addons/amxmodx/data/lang/time.txt
diff --git a/gamedir/addons/amxmodx/data/lang/timeleft.txt b/src/addons/amxmodx/data/lang/timeleft.txt
similarity index 100%
rename from gamedir/addons/amxmodx/data/lang/timeleft.txt
rename to src/addons/amxmodx/data/lang/timeleft.txt
diff --git a/gamedir/addons/amxmodx/dlls/amxmodx_mm_i386.so b/src/addons/amxmodx/dlls/amxmodx_mm_i386.so
similarity index 100%
rename from gamedir/addons/amxmodx/dlls/amxmodx_mm_i386.so
rename to src/addons/amxmodx/dlls/amxmodx_mm_i386.so
diff --git a/gamedir/addons/amxmodx/modules/engine_amxx_i386.so b/src/addons/amxmodx/modules/engine_amxx_i386.so
similarity index 100%
rename from gamedir/addons/amxmodx/modules/engine_amxx_i386.so
rename to src/addons/amxmodx/modules/engine_amxx_i386.so
diff --git a/gamedir/addons/amxmodx/modules/fakemeta_amxx_i386.so b/src/addons/amxmodx/modules/fakemeta_amxx_i386.so
similarity index 100%
rename from gamedir/addons/amxmodx/modules/fakemeta_amxx_i386.so
rename to src/addons/amxmodx/modules/fakemeta_amxx_i386.so
diff --git a/gamedir/addons/amxmodx/modules/fun_amxx_i386.so b/src/addons/amxmodx/modules/fun_amxx_i386.so
similarity index 100%
rename from gamedir/addons/amxmodx/modules/fun_amxx_i386.so
rename to src/addons/amxmodx/modules/fun_amxx_i386.so
diff --git a/gamedir/addons/amxmodx/modules/geoip_amxx_i386.so b/src/addons/amxmodx/modules/geoip_amxx_i386.so
similarity index 100%
rename from gamedir/addons/amxmodx/modules/geoip_amxx_i386.so
rename to src/addons/amxmodx/modules/geoip_amxx_i386.so
diff --git a/gamedir/addons/amxmodx/modules/hamsandwich_amxx_i386.so b/src/addons/amxmodx/modules/hamsandwich_amxx_i386.so
similarity index 100%
rename from gamedir/addons/amxmodx/modules/hamsandwich_amxx_i386.so
rename to src/addons/amxmodx/modules/hamsandwich_amxx_i386.so
diff --git a/gamedir/addons/amxmodx/modules/mysql_amxx_i386.so b/src/addons/amxmodx/modules/mysql_amxx_i386.so
similarity index 100%
rename from gamedir/addons/amxmodx/modules/mysql_amxx_i386.so
rename to src/addons/amxmodx/modules/mysql_amxx_i386.so
diff --git a/gamedir/addons/amxmodx/modules/nvault_amxx_i386.so b/src/addons/amxmodx/modules/nvault_amxx_i386.so
similarity index 100%
rename from gamedir/addons/amxmodx/modules/nvault_amxx_i386.so
rename to src/addons/amxmodx/modules/nvault_amxx_i386.so
diff --git a/gamedir/addons/amxmodx/modules/regex_amxx_i386.so b/src/addons/amxmodx/modules/regex_amxx_i386.so
similarity index 100%
rename from gamedir/addons/amxmodx/modules/regex_amxx_i386.so
rename to src/addons/amxmodx/modules/regex_amxx_i386.so
diff --git a/gamedir/addons/amxmodx/modules/sockets_amxx_i386.so b/src/addons/amxmodx/modules/sockets_amxx_i386.so
similarity index 100%
rename from gamedir/addons/amxmodx/modules/sockets_amxx_i386.so
rename to src/addons/amxmodx/modules/sockets_amxx_i386.so
diff --git a/gamedir/addons/amxmodx/modules/sqlite_amxx_i386.so b/src/addons/amxmodx/modules/sqlite_amxx_i386.so
similarity index 100%
rename from gamedir/addons/amxmodx/modules/sqlite_amxx_i386.so
rename to src/addons/amxmodx/modules/sqlite_amxx_i386.so
diff --git a/gamedir/addons/amxmodx/plugins/admin.amxx b/src/addons/amxmodx/plugins/admin.amxx
similarity index 100%
rename from gamedir/addons/amxmodx/plugins/admin.amxx
rename to src/addons/amxmodx/plugins/admin.amxx
diff --git a/gamedir/addons/amxmodx/plugins/admin_sql.amxx b/src/addons/amxmodx/plugins/admin_sql.amxx
similarity index 100%
rename from gamedir/addons/amxmodx/plugins/admin_sql.amxx
rename to src/addons/amxmodx/plugins/admin_sql.amxx
diff --git a/gamedir/addons/amxmodx/plugins/adminchat.amxx b/src/addons/amxmodx/plugins/adminchat.amxx
similarity index 100%
rename from gamedir/addons/amxmodx/plugins/adminchat.amxx
rename to src/addons/amxmodx/plugins/adminchat.amxx
diff --git a/gamedir/addons/amxmodx/plugins/admincmd.amxx b/src/addons/amxmodx/plugins/admincmd.amxx
similarity index 100%
rename from gamedir/addons/amxmodx/plugins/admincmd.amxx
rename to src/addons/amxmodx/plugins/admincmd.amxx
diff --git a/gamedir/addons/amxmodx/plugins/adminhelp.amxx b/src/addons/amxmodx/plugins/adminhelp.amxx
similarity index 100%
rename from gamedir/addons/amxmodx/plugins/adminhelp.amxx
rename to src/addons/amxmodx/plugins/adminhelp.amxx
diff --git a/gamedir/addons/amxmodx/plugins/adminslots.amxx b/src/addons/amxmodx/plugins/adminslots.amxx
similarity index 100%
rename from gamedir/addons/amxmodx/plugins/adminslots.amxx
rename to src/addons/amxmodx/plugins/adminslots.amxx
diff --git a/gamedir/addons/amxmodx/plugins/adminvote.amxx b/src/addons/amxmodx/plugins/adminvote.amxx
similarity index 100%
rename from gamedir/addons/amxmodx/plugins/adminvote.amxx
rename to src/addons/amxmodx/plugins/adminvote.amxx
diff --git a/gamedir/addons/amxmodx/plugins/amxmod_compat.amxx b/src/addons/amxmodx/plugins/amxmod_compat.amxx
similarity index 100%
rename from gamedir/addons/amxmodx/plugins/amxmod_compat.amxx
rename to src/addons/amxmodx/plugins/amxmod_compat.amxx
diff --git a/gamedir/addons/amxmodx/plugins/antiflood.amxx b/src/addons/amxmodx/plugins/antiflood.amxx
similarity index 100%
rename from gamedir/addons/amxmodx/plugins/antiflood.amxx
rename to src/addons/amxmodx/plugins/antiflood.amxx
diff --git a/gamedir/addons/amxmodx/plugins/cmdmenu.amxx b/src/addons/amxmodx/plugins/cmdmenu.amxx
similarity index 100%
rename from gamedir/addons/amxmodx/plugins/cmdmenu.amxx
rename to src/addons/amxmodx/plugins/cmdmenu.amxx
diff --git a/gamedir/addons/amxmodx/plugins/imessage.amxx b/src/addons/amxmodx/plugins/imessage.amxx
similarity index 100%
rename from gamedir/addons/amxmodx/plugins/imessage.amxx
rename to src/addons/amxmodx/plugins/imessage.amxx
diff --git a/gamedir/addons/amxmodx/plugins/mapchooser.amxx b/src/addons/amxmodx/plugins/mapchooser.amxx
similarity index 100%
rename from gamedir/addons/amxmodx/plugins/mapchooser.amxx
rename to src/addons/amxmodx/plugins/mapchooser.amxx
diff --git a/gamedir/addons/amxmodx/plugins/mapsmenu.amxx b/src/addons/amxmodx/plugins/mapsmenu.amxx
similarity index 100%
rename from gamedir/addons/amxmodx/plugins/mapsmenu.amxx
rename to src/addons/amxmodx/plugins/mapsmenu.amxx
diff --git a/gamedir/addons/amxmodx/plugins/menufront.amxx b/src/addons/amxmodx/plugins/menufront.amxx
similarity index 100%
rename from gamedir/addons/amxmodx/plugins/menufront.amxx
rename to src/addons/amxmodx/plugins/menufront.amxx
diff --git a/gamedir/addons/amxmodx/plugins/multilingual.amxx b/src/addons/amxmodx/plugins/multilingual.amxx
similarity index 100%
rename from gamedir/addons/amxmodx/plugins/multilingual.amxx
rename to src/addons/amxmodx/plugins/multilingual.amxx
diff --git a/gamedir/addons/amxmodx/plugins/nextmap.amxx b/src/addons/amxmodx/plugins/nextmap.amxx
similarity index 100%
rename from gamedir/addons/amxmodx/plugins/nextmap.amxx
rename to src/addons/amxmodx/plugins/nextmap.amxx
diff --git a/gamedir/addons/amxmodx/plugins/pausecfg.amxx b/src/addons/amxmodx/plugins/pausecfg.amxx
similarity index 100%
rename from gamedir/addons/amxmodx/plugins/pausecfg.amxx
rename to src/addons/amxmodx/plugins/pausecfg.amxx
diff --git a/gamedir/addons/amxmodx/plugins/plmenu.amxx b/src/addons/amxmodx/plugins/plmenu.amxx
similarity index 100%
rename from gamedir/addons/amxmodx/plugins/plmenu.amxx
rename to src/addons/amxmodx/plugins/plmenu.amxx
diff --git a/gamedir/addons/amxmodx/plugins/pluginmenu.amxx b/src/addons/amxmodx/plugins/pluginmenu.amxx
similarity index 100%
rename from gamedir/addons/amxmodx/plugins/pluginmenu.amxx
rename to src/addons/amxmodx/plugins/pluginmenu.amxx
diff --git a/gamedir/addons/amxmodx/plugins/scrollmsg.amxx b/src/addons/amxmodx/plugins/scrollmsg.amxx
similarity index 100%
rename from gamedir/addons/amxmodx/plugins/scrollmsg.amxx
rename to src/addons/amxmodx/plugins/scrollmsg.amxx
diff --git a/gamedir/addons/amxmodx/plugins/statscfg.amxx b/src/addons/amxmodx/plugins/statscfg.amxx
similarity index 100%
rename from gamedir/addons/amxmodx/plugins/statscfg.amxx
rename to src/addons/amxmodx/plugins/statscfg.amxx
diff --git a/gamedir/addons/amxmodx/plugins/telemenu.amxx b/src/addons/amxmodx/plugins/telemenu.amxx
similarity index 100%
rename from gamedir/addons/amxmodx/plugins/telemenu.amxx
rename to src/addons/amxmodx/plugins/telemenu.amxx
diff --git a/gamedir/addons/amxmodx/plugins/timeleft.amxx b/src/addons/amxmodx/plugins/timeleft.amxx
similarity index 100%
rename from gamedir/addons/amxmodx/plugins/timeleft.amxx
rename to src/addons/amxmodx/plugins/timeleft.amxx
diff --git a/gamedir/addons/amxmodx/scripting/admin.sma b/src/addons/amxmodx/scripting/admin.sma
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/admin.sma
rename to src/addons/amxmodx/scripting/admin.sma
diff --git a/gamedir/addons/amxmodx/scripting/adminchat.sma b/src/addons/amxmodx/scripting/adminchat.sma
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/adminchat.sma
rename to src/addons/amxmodx/scripting/adminchat.sma
diff --git a/gamedir/addons/amxmodx/scripting/admincmd.sma b/src/addons/amxmodx/scripting/admincmd.sma
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/admincmd.sma
rename to src/addons/amxmodx/scripting/admincmd.sma
diff --git a/gamedir/addons/amxmodx/scripting/adminhelp.sma b/src/addons/amxmodx/scripting/adminhelp.sma
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/adminhelp.sma
rename to src/addons/amxmodx/scripting/adminhelp.sma
diff --git a/gamedir/addons/amxmodx/scripting/adminslots.sma b/src/addons/amxmodx/scripting/adminslots.sma
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/adminslots.sma
rename to src/addons/amxmodx/scripting/adminslots.sma
diff --git a/gamedir/addons/amxmodx/scripting/adminvote.sma b/src/addons/amxmodx/scripting/adminvote.sma
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/adminvote.sma
rename to src/addons/amxmodx/scripting/adminvote.sma
diff --git a/gamedir/addons/amxmodx/scripting/amx_log copy.sma b/src/addons/amxmodx/scripting/amx_log copy.sma
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/amx_log copy.sma
rename to src/addons/amxmodx/scripting/amx_log copy.sma
diff --git a/gamedir/addons/amxmodx/scripting/amx_log.sma b/src/addons/amxmodx/scripting/amx_log.sma
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/amx_log.sma
rename to src/addons/amxmodx/scripting/amx_log.sma
diff --git a/gamedir/addons/amxmodx/scripting/amxmod_compat/amxmod_compat.sma b/src/addons/amxmodx/scripting/amxmod_compat/amxmod_compat.sma
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/amxmod_compat/amxmod_compat.sma
rename to src/addons/amxmodx/scripting/amxmod_compat/amxmod_compat.sma
diff --git a/gamedir/addons/amxmodx/scripting/amxmod_compat/core.sma b/src/addons/amxmodx/scripting/amxmod_compat/core.sma
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/amxmod_compat/core.sma
rename to src/addons/amxmodx/scripting/amxmod_compat/core.sma
diff --git a/gamedir/addons/amxmodx/scripting/amxmod_compat/mysql.sma b/src/addons/amxmodx/scripting/amxmod_compat/mysql.sma
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/amxmod_compat/mysql.sma
rename to src/addons/amxmodx/scripting/amxmod_compat/mysql.sma
diff --git a/gamedir/addons/amxmodx/scripting/amxmod_compat/vexdum.sma b/src/addons/amxmodx/scripting/amxmod_compat/vexdum.sma
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/amxmod_compat/vexdum.sma
rename to src/addons/amxmodx/scripting/amxmod_compat/vexdum.sma
diff --git a/gamedir/addons/amxmodx/scripting/amxxpc b/src/addons/amxmodx/scripting/amxxpc
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/amxxpc
rename to src/addons/amxmodx/scripting/amxxpc
diff --git a/gamedir/addons/amxmodx/scripting/amxxpc32.so b/src/addons/amxmodx/scripting/amxxpc32.so
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/amxxpc32.so
rename to src/addons/amxmodx/scripting/amxxpc32.so
diff --git a/gamedir/addons/amxmodx/scripting/antiflood.sma b/src/addons/amxmodx/scripting/antiflood.sma
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/antiflood.sma
rename to src/addons/amxmodx/scripting/antiflood.sma
diff --git a/gamedir/addons/amxmodx/scripting/cmdmenu.sma b/src/addons/amxmodx/scripting/cmdmenu.sma
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/cmdmenu.sma
rename to src/addons/amxmodx/scripting/cmdmenu.sma
diff --git a/gamedir/addons/amxmodx/scripting/compile.sh b/src/addons/amxmodx/scripting/compile.sh
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/compile.sh
rename to src/addons/amxmodx/scripting/compile.sh
diff --git a/gamedir/addons/amxmodx/scripting/crossfire_siren_fix.sma b/src/addons/amxmodx/scripting/crossfire_siren_fix.sma
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/crossfire_siren_fix.sma
rename to src/addons/amxmodx/scripting/crossfire_siren_fix.sma
diff --git a/gamedir/addons/amxmodx/scripting/imessage.sma b/src/addons/amxmodx/scripting/imessage.sma
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/imessage.sma
rename to src/addons/amxmodx/scripting/imessage.sma
diff --git a/gamedir/addons/amxmodx/scripting/include/amxconst.inc b/src/addons/amxmodx/scripting/include/amxconst.inc
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/include/amxconst.inc
rename to src/addons/amxmodx/scripting/include/amxconst.inc
diff --git a/gamedir/addons/amxmodx/scripting/include/amxmisc.inc b/src/addons/amxmodx/scripting/include/amxmisc.inc
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/include/amxmisc.inc
rename to src/addons/amxmodx/scripting/include/amxmisc.inc
diff --git a/gamedir/addons/amxmodx/scripting/include/amxmod_compat/VexdUM.inc b/src/addons/amxmodx/scripting/include/amxmod_compat/VexdUM.inc
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/include/amxmod_compat/VexdUM.inc
rename to src/addons/amxmodx/scripting/include/amxmod_compat/VexdUM.inc
diff --git a/gamedir/addons/amxmodx/scripting/include/amxmod_compat/VexdUM_const.inc b/src/addons/amxmodx/scripting/include/amxmod_compat/VexdUM_const.inc
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/include/amxmod_compat/VexdUM_const.inc
rename to src/addons/amxmodx/scripting/include/amxmod_compat/VexdUM_const.inc
diff --git a/gamedir/addons/amxmodx/scripting/include/amxmod_compat/VexdUM_stock.inc b/src/addons/amxmodx/scripting/include/amxmod_compat/VexdUM_stock.inc
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/include/amxmod_compat/VexdUM_stock.inc
rename to src/addons/amxmodx/scripting/include/amxmod_compat/VexdUM_stock.inc
diff --git a/gamedir/addons/amxmodx/scripting/include/amxmod_compat/Vexd_Utilities.inc b/src/addons/amxmodx/scripting/include/amxmod_compat/Vexd_Utilities.inc
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/include/amxmod_compat/Vexd_Utilities.inc
rename to src/addons/amxmodx/scripting/include/amxmod_compat/Vexd_Utilities.inc
diff --git a/gamedir/addons/amxmodx/scripting/include/amxmod_compat/amxmod.inc b/src/addons/amxmodx/scripting/include/amxmod_compat/amxmod.inc
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/include/amxmod_compat/amxmod.inc
rename to src/addons/amxmodx/scripting/include/amxmod_compat/amxmod.inc
diff --git a/gamedir/addons/amxmodx/scripting/include/amxmod_compat/maths.inc b/src/addons/amxmodx/scripting/include/amxmod_compat/maths.inc
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/include/amxmod_compat/maths.inc
rename to src/addons/amxmodx/scripting/include/amxmod_compat/maths.inc
diff --git a/gamedir/addons/amxmodx/scripting/include/amxmod_compat/mysql.inc b/src/addons/amxmodx/scripting/include/amxmod_compat/mysql.inc
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/include/amxmod_compat/mysql.inc
rename to src/addons/amxmodx/scripting/include/amxmod_compat/mysql.inc
diff --git a/gamedir/addons/amxmodx/scripting/include/amxmod_compat/translator.inc b/src/addons/amxmodx/scripting/include/amxmod_compat/translator.inc
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/include/amxmod_compat/translator.inc
rename to src/addons/amxmodx/scripting/include/amxmod_compat/translator.inc
diff --git a/gamedir/addons/amxmodx/scripting/include/amxmod_compat/xtrafun.inc b/src/addons/amxmodx/scripting/include/amxmod_compat/xtrafun.inc
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/include/amxmod_compat/xtrafun.inc
rename to src/addons/amxmodx/scripting/include/amxmod_compat/xtrafun.inc
diff --git a/gamedir/addons/amxmodx/scripting/include/amxmodx.inc b/src/addons/amxmodx/scripting/include/amxmodx.inc
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/include/amxmodx.inc
rename to src/addons/amxmodx/scripting/include/amxmodx.inc
diff --git a/gamedir/addons/amxmodx/scripting/include/cellarray.inc b/src/addons/amxmodx/scripting/include/cellarray.inc
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/include/cellarray.inc
rename to src/addons/amxmodx/scripting/include/cellarray.inc
diff --git a/gamedir/addons/amxmodx/scripting/include/celltrie.inc b/src/addons/amxmodx/scripting/include/celltrie.inc
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/include/celltrie.inc
rename to src/addons/amxmodx/scripting/include/celltrie.inc
diff --git a/gamedir/addons/amxmodx/scripting/include/core.inc b/src/addons/amxmodx/scripting/include/core.inc
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/include/core.inc
rename to src/addons/amxmodx/scripting/include/core.inc
diff --git a/gamedir/addons/amxmodx/scripting/include/csstats.inc b/src/addons/amxmodx/scripting/include/csstats.inc
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/include/csstats.inc
rename to src/addons/amxmodx/scripting/include/csstats.inc
diff --git a/gamedir/addons/amxmodx/scripting/include/cstrike.inc b/src/addons/amxmodx/scripting/include/cstrike.inc
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/include/cstrike.inc
rename to src/addons/amxmodx/scripting/include/cstrike.inc
diff --git a/gamedir/addons/amxmodx/scripting/include/csx.inc b/src/addons/amxmodx/scripting/include/csx.inc
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/include/csx.inc
rename to src/addons/amxmodx/scripting/include/csx.inc
diff --git a/gamedir/addons/amxmodx/scripting/include/dbi.inc b/src/addons/amxmodx/scripting/include/dbi.inc
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/include/dbi.inc
rename to src/addons/amxmodx/scripting/include/dbi.inc
diff --git a/gamedir/addons/amxmodx/scripting/include/dodconst.inc b/src/addons/amxmodx/scripting/include/dodconst.inc
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/include/dodconst.inc
rename to src/addons/amxmodx/scripting/include/dodconst.inc
diff --git a/gamedir/addons/amxmodx/scripting/include/dodfun.inc b/src/addons/amxmodx/scripting/include/dodfun.inc
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/include/dodfun.inc
rename to src/addons/amxmodx/scripting/include/dodfun.inc
diff --git a/gamedir/addons/amxmodx/scripting/include/dodstats.inc b/src/addons/amxmodx/scripting/include/dodstats.inc
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/include/dodstats.inc
rename to src/addons/amxmodx/scripting/include/dodstats.inc
diff --git a/gamedir/addons/amxmodx/scripting/include/dodx.inc b/src/addons/amxmodx/scripting/include/dodx.inc
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/include/dodx.inc
rename to src/addons/amxmodx/scripting/include/dodx.inc
diff --git a/gamedir/addons/amxmodx/scripting/include/engine.inc b/src/addons/amxmodx/scripting/include/engine.inc
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/include/engine.inc
rename to src/addons/amxmodx/scripting/include/engine.inc
diff --git a/gamedir/addons/amxmodx/scripting/include/engine_const.inc b/src/addons/amxmodx/scripting/include/engine_const.inc
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/include/engine_const.inc
rename to src/addons/amxmodx/scripting/include/engine_const.inc
diff --git a/gamedir/addons/amxmodx/scripting/include/engine_stocks.inc b/src/addons/amxmodx/scripting/include/engine_stocks.inc
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/include/engine_stocks.inc
rename to src/addons/amxmodx/scripting/include/engine_stocks.inc
diff --git a/gamedir/addons/amxmodx/scripting/include/esf.inc b/src/addons/amxmodx/scripting/include/esf.inc
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/include/esf.inc
rename to src/addons/amxmodx/scripting/include/esf.inc
diff --git a/gamedir/addons/amxmodx/scripting/include/esf_const.inc b/src/addons/amxmodx/scripting/include/esf_const.inc
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/include/esf_const.inc
rename to src/addons/amxmodx/scripting/include/esf_const.inc
diff --git a/gamedir/addons/amxmodx/scripting/include/fakemeta.inc b/src/addons/amxmodx/scripting/include/fakemeta.inc
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/include/fakemeta.inc
rename to src/addons/amxmodx/scripting/include/fakemeta.inc
diff --git a/gamedir/addons/amxmodx/scripting/include/fakemeta_const.inc b/src/addons/amxmodx/scripting/include/fakemeta_const.inc
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/include/fakemeta_const.inc
rename to src/addons/amxmodx/scripting/include/fakemeta_const.inc
diff --git a/gamedir/addons/amxmodx/scripting/include/fakemeta_stocks.inc b/src/addons/amxmodx/scripting/include/fakemeta_stocks.inc
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/include/fakemeta_stocks.inc
rename to src/addons/amxmodx/scripting/include/fakemeta_stocks.inc
diff --git a/gamedir/addons/amxmodx/scripting/include/fakemeta_util.inc b/src/addons/amxmodx/scripting/include/fakemeta_util.inc
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/include/fakemeta_util.inc
rename to src/addons/amxmodx/scripting/include/fakemeta_util.inc
diff --git a/gamedir/addons/amxmodx/scripting/include/file.inc b/src/addons/amxmodx/scripting/include/file.inc
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/include/file.inc
rename to src/addons/amxmodx/scripting/include/file.inc
diff --git a/gamedir/addons/amxmodx/scripting/include/float.inc b/src/addons/amxmodx/scripting/include/float.inc
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/include/float.inc
rename to src/addons/amxmodx/scripting/include/float.inc
diff --git a/gamedir/addons/amxmodx/scripting/include/fun.inc b/src/addons/amxmodx/scripting/include/fun.inc
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/include/fun.inc
rename to src/addons/amxmodx/scripting/include/fun.inc
diff --git a/gamedir/addons/amxmodx/scripting/include/geoip.inc b/src/addons/amxmodx/scripting/include/geoip.inc
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/include/geoip.inc
rename to src/addons/amxmodx/scripting/include/geoip.inc
diff --git a/gamedir/addons/amxmodx/scripting/include/ham_const.inc b/src/addons/amxmodx/scripting/include/ham_const.inc
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/include/ham_const.inc
rename to src/addons/amxmodx/scripting/include/ham_const.inc
diff --git a/gamedir/addons/amxmodx/scripting/include/hamsandwich.inc b/src/addons/amxmodx/scripting/include/hamsandwich.inc
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/include/hamsandwich.inc
rename to src/addons/amxmodx/scripting/include/hamsandwich.inc
diff --git a/gamedir/addons/amxmodx/scripting/include/hlsdk_const.inc b/src/addons/amxmodx/scripting/include/hlsdk_const.inc
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/include/hlsdk_const.inc
rename to src/addons/amxmodx/scripting/include/hlsdk_const.inc
diff --git a/gamedir/addons/amxmodx/scripting/include/lang.inc b/src/addons/amxmodx/scripting/include/lang.inc
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/include/lang.inc
rename to src/addons/amxmodx/scripting/include/lang.inc
diff --git a/gamedir/addons/amxmodx/scripting/include/message_const.inc b/src/addons/amxmodx/scripting/include/message_const.inc
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/include/message_const.inc
rename to src/addons/amxmodx/scripting/include/message_const.inc
diff --git a/gamedir/addons/amxmodx/scripting/include/message_stocks.inc b/src/addons/amxmodx/scripting/include/message_stocks.inc
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/include/message_stocks.inc
rename to src/addons/amxmodx/scripting/include/message_stocks.inc
diff --git a/gamedir/addons/amxmodx/scripting/include/messages.inc b/src/addons/amxmodx/scripting/include/messages.inc
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/include/messages.inc
rename to src/addons/amxmodx/scripting/include/messages.inc
diff --git a/gamedir/addons/amxmodx/scripting/include/newmenus.inc b/src/addons/amxmodx/scripting/include/newmenus.inc
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/include/newmenus.inc
rename to src/addons/amxmodx/scripting/include/newmenus.inc
diff --git a/gamedir/addons/amxmodx/scripting/include/ns.inc b/src/addons/amxmodx/scripting/include/ns.inc
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/include/ns.inc
rename to src/addons/amxmodx/scripting/include/ns.inc
diff --git a/gamedir/addons/amxmodx/scripting/include/ns2amx.inc b/src/addons/amxmodx/scripting/include/ns2amx.inc
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/include/ns2amx.inc
rename to src/addons/amxmodx/scripting/include/ns2amx.inc
diff --git a/gamedir/addons/amxmodx/scripting/include/ns_const.inc b/src/addons/amxmodx/scripting/include/ns_const.inc
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/include/ns_const.inc
rename to src/addons/amxmodx/scripting/include/ns_const.inc
diff --git a/gamedir/addons/amxmodx/scripting/include/nvault.inc b/src/addons/amxmodx/scripting/include/nvault.inc
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/include/nvault.inc
rename to src/addons/amxmodx/scripting/include/nvault.inc
diff --git a/gamedir/addons/amxmodx/scripting/include/regex.inc b/src/addons/amxmodx/scripting/include/regex.inc
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/include/regex.inc
rename to src/addons/amxmodx/scripting/include/regex.inc
diff --git a/gamedir/addons/amxmodx/scripting/include/sockets.inc b/src/addons/amxmodx/scripting/include/sockets.inc
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/include/sockets.inc
rename to src/addons/amxmodx/scripting/include/sockets.inc
diff --git a/gamedir/addons/amxmodx/scripting/include/sorting.inc b/src/addons/amxmodx/scripting/include/sorting.inc
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/include/sorting.inc
rename to src/addons/amxmodx/scripting/include/sorting.inc
diff --git a/gamedir/addons/amxmodx/scripting/include/sqlx.inc b/src/addons/amxmodx/scripting/include/sqlx.inc
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/include/sqlx.inc
rename to src/addons/amxmodx/scripting/include/sqlx.inc
diff --git a/gamedir/addons/amxmodx/scripting/include/string.inc b/src/addons/amxmodx/scripting/include/string.inc
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/include/string.inc
rename to src/addons/amxmodx/scripting/include/string.inc
diff --git a/gamedir/addons/amxmodx/scripting/include/svn_version.inc b/src/addons/amxmodx/scripting/include/svn_version.inc
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/include/svn_version.inc
rename to src/addons/amxmodx/scripting/include/svn_version.inc
diff --git a/gamedir/addons/amxmodx/scripting/include/svn_version.tpl b/src/addons/amxmodx/scripting/include/svn_version.tpl
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/include/svn_version.tpl
rename to src/addons/amxmodx/scripting/include/svn_version.tpl
diff --git a/gamedir/addons/amxmodx/scripting/include/tfcconst.inc b/src/addons/amxmodx/scripting/include/tfcconst.inc
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/include/tfcconst.inc
rename to src/addons/amxmodx/scripting/include/tfcconst.inc
diff --git a/gamedir/addons/amxmodx/scripting/include/tfcstats.inc b/src/addons/amxmodx/scripting/include/tfcstats.inc
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/include/tfcstats.inc
rename to src/addons/amxmodx/scripting/include/tfcstats.inc
diff --git a/gamedir/addons/amxmodx/scripting/include/tfcx.inc b/src/addons/amxmodx/scripting/include/tfcx.inc
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/include/tfcx.inc
rename to src/addons/amxmodx/scripting/include/tfcx.inc
diff --git a/gamedir/addons/amxmodx/scripting/include/time.inc b/src/addons/amxmodx/scripting/include/time.inc
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/include/time.inc
rename to src/addons/amxmodx/scripting/include/time.inc
diff --git a/gamedir/addons/amxmodx/scripting/include/tsconst.inc b/src/addons/amxmodx/scripting/include/tsconst.inc
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/include/tsconst.inc
rename to src/addons/amxmodx/scripting/include/tsconst.inc
diff --git a/gamedir/addons/amxmodx/scripting/include/tsfun.inc b/src/addons/amxmodx/scripting/include/tsfun.inc
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/include/tsfun.inc
rename to src/addons/amxmodx/scripting/include/tsfun.inc
diff --git a/gamedir/addons/amxmodx/scripting/include/tsstats.inc b/src/addons/amxmodx/scripting/include/tsstats.inc
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/include/tsstats.inc
rename to src/addons/amxmodx/scripting/include/tsstats.inc
diff --git a/gamedir/addons/amxmodx/scripting/include/tsx.inc b/src/addons/amxmodx/scripting/include/tsx.inc
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/include/tsx.inc
rename to src/addons/amxmodx/scripting/include/tsx.inc
diff --git a/gamedir/addons/amxmodx/scripting/include/vault.inc b/src/addons/amxmodx/scripting/include/vault.inc
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/include/vault.inc
rename to src/addons/amxmodx/scripting/include/vault.inc
diff --git a/gamedir/addons/amxmodx/scripting/include/vector.inc b/src/addons/amxmodx/scripting/include/vector.inc
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/include/vector.inc
rename to src/addons/amxmodx/scripting/include/vector.inc
diff --git a/gamedir/addons/amxmodx/scripting/include/xs.inc b/src/addons/amxmodx/scripting/include/xs.inc
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/include/xs.inc
rename to src/addons/amxmodx/scripting/include/xs.inc
diff --git a/gamedir/addons/amxmodx/scripting/mapchooser.sma b/src/addons/amxmodx/scripting/mapchooser.sma
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/mapchooser.sma
rename to src/addons/amxmodx/scripting/mapchooser.sma
diff --git a/gamedir/addons/amxmodx/scripting/mapsmenu.sma b/src/addons/amxmodx/scripting/mapsmenu.sma
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/mapsmenu.sma
rename to src/addons/amxmodx/scripting/mapsmenu.sma
diff --git a/gamedir/addons/amxmodx/scripting/menufront.sma b/src/addons/amxmodx/scripting/menufront.sma
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/menufront.sma
rename to src/addons/amxmodx/scripting/menufront.sma
diff --git a/gamedir/addons/amxmodx/scripting/multilingual.sma b/src/addons/amxmodx/scripting/multilingual.sma
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/multilingual.sma
rename to src/addons/amxmodx/scripting/multilingual.sma
diff --git a/gamedir/addons/amxmodx/scripting/nextmap.sma b/src/addons/amxmodx/scripting/nextmap.sma
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/nextmap.sma
rename to src/addons/amxmodx/scripting/nextmap.sma
diff --git a/gamedir/addons/amxmodx/scripting/pausecfg.sma b/src/addons/amxmodx/scripting/pausecfg.sma
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/pausecfg.sma
rename to src/addons/amxmodx/scripting/pausecfg.sma
diff --git a/gamedir/addons/amxmodx/scripting/plmenu.sma b/src/addons/amxmodx/scripting/plmenu.sma
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/plmenu.sma
rename to src/addons/amxmodx/scripting/plmenu.sma
diff --git a/gamedir/addons/amxmodx/scripting/pluginmenu.sma b/src/addons/amxmodx/scripting/pluginmenu.sma
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/pluginmenu.sma
rename to src/addons/amxmodx/scripting/pluginmenu.sma
diff --git a/gamedir/addons/amxmodx/scripting/scrollmsg.sma b/src/addons/amxmodx/scripting/scrollmsg.sma
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/scrollmsg.sma
rename to src/addons/amxmodx/scripting/scrollmsg.sma
diff --git a/gamedir/addons/amxmodx/scripting/statscfg.sma b/src/addons/amxmodx/scripting/statscfg.sma
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/statscfg.sma
rename to src/addons/amxmodx/scripting/statscfg.sma
diff --git a/gamedir/addons/amxmodx/scripting/telemenu.sma b/src/addons/amxmodx/scripting/telemenu.sma
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/telemenu.sma
rename to src/addons/amxmodx/scripting/telemenu.sma
diff --git a/gamedir/addons/amxmodx/scripting/testsuite/admins_test.sma b/src/addons/amxmodx/scripting/testsuite/admins_test.sma
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/testsuite/admins_test.sma
rename to src/addons/amxmodx/scripting/testsuite/admins_test.sma
diff --git a/gamedir/addons/amxmodx/scripting/testsuite/arraytest.sma b/src/addons/amxmodx/scripting/testsuite/arraytest.sma
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/testsuite/arraytest.sma
rename to src/addons/amxmodx/scripting/testsuite/arraytest.sma
diff --git a/gamedir/addons/amxmodx/scripting/testsuite/callfunc_test.sma b/src/addons/amxmodx/scripting/testsuite/callfunc_test.sma
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/testsuite/callfunc_test.sma
rename to src/addons/amxmodx/scripting/testsuite/callfunc_test.sma
diff --git a/gamedir/addons/amxmodx/scripting/testsuite/fakemeta_tests.sma b/src/addons/amxmodx/scripting/testsuite/fakemeta_tests.sma
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/testsuite/fakemeta_tests.sma
rename to src/addons/amxmodx/scripting/testsuite/fakemeta_tests.sma
diff --git a/gamedir/addons/amxmodx/scripting/testsuite/fmttest.sma b/src/addons/amxmodx/scripting/testsuite/fmttest.sma
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/testsuite/fmttest.sma
rename to src/addons/amxmodx/scripting/testsuite/fmttest.sma
diff --git a/gamedir/addons/amxmodx/scripting/testsuite/fwdtest1.sma b/src/addons/amxmodx/scripting/testsuite/fwdtest1.sma
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/testsuite/fwdtest1.sma
rename to src/addons/amxmodx/scripting/testsuite/fwdtest1.sma
diff --git a/gamedir/addons/amxmodx/scripting/testsuite/fwdtest2.sma b/src/addons/amxmodx/scripting/testsuite/fwdtest2.sma
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/testsuite/fwdtest2.sma
rename to src/addons/amxmodx/scripting/testsuite/fwdtest2.sma
diff --git a/gamedir/addons/amxmodx/scripting/testsuite/logtest.sma b/src/addons/amxmodx/scripting/testsuite/logtest.sma
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/testsuite/logtest.sma
rename to src/addons/amxmodx/scripting/testsuite/logtest.sma
diff --git a/gamedir/addons/amxmodx/scripting/testsuite/menutest.sma b/src/addons/amxmodx/scripting/testsuite/menutest.sma
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/testsuite/menutest.sma
rename to src/addons/amxmodx/scripting/testsuite/menutest.sma
diff --git a/gamedir/addons/amxmodx/scripting/testsuite/native_test.sma b/src/addons/amxmodx/scripting/testsuite/native_test.sma
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/testsuite/native_test.sma
rename to src/addons/amxmodx/scripting/testsuite/native_test.sma
diff --git a/gamedir/addons/amxmodx/scripting/testsuite/nvault_test.sma b/src/addons/amxmodx/scripting/testsuite/nvault_test.sma
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/testsuite/nvault_test.sma
rename to src/addons/amxmodx/scripting/testsuite/nvault_test.sma
diff --git a/gamedir/addons/amxmodx/scripting/testsuite/sorttest.sma b/src/addons/amxmodx/scripting/testsuite/sorttest.sma
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/testsuite/sorttest.sma
rename to src/addons/amxmodx/scripting/testsuite/sorttest.sma
diff --git a/gamedir/addons/amxmodx/scripting/testsuite/sqlxtest.sma b/src/addons/amxmodx/scripting/testsuite/sqlxtest.sma
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/testsuite/sqlxtest.sma
rename to src/addons/amxmodx/scripting/testsuite/sqlxtest.sma
diff --git a/gamedir/addons/amxmodx/scripting/testsuite/sqlxtest.sq3 b/src/addons/amxmodx/scripting/testsuite/sqlxtest.sq3
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/testsuite/sqlxtest.sq3
rename to src/addons/amxmodx/scripting/testsuite/sqlxtest.sq3
diff --git a/gamedir/addons/amxmodx/scripting/testsuite/sqlxtest.sql b/src/addons/amxmodx/scripting/testsuite/sqlxtest.sql
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/testsuite/sqlxtest.sql
rename to src/addons/amxmodx/scripting/testsuite/sqlxtest.sql
diff --git a/gamedir/addons/amxmodx/scripting/testsuite/trietest.sma b/src/addons/amxmodx/scripting/testsuite/trietest.sma
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/testsuite/trietest.sma
rename to src/addons/amxmodx/scripting/testsuite/trietest.sma
diff --git a/gamedir/addons/amxmodx/scripting/timeleft.sma b/src/addons/amxmodx/scripting/timeleft.sma
similarity index 100%
rename from gamedir/addons/amxmodx/scripting/timeleft.sma
rename to src/addons/amxmodx/scripting/timeleft.sma
diff --git a/gamedir/addons/metamod/dlls/metamod.so b/src/addons/metamod/dlls/metamod.so
similarity index 100%
rename from gamedir/addons/metamod/dlls/metamod.so
rename to src/addons/metamod/dlls/metamod.so
diff --git a/gamedir/addons/metamod/plugins.ini b/src/addons/metamod/plugins.ini
similarity index 100%
rename from gamedir/addons/metamod/plugins.ini
rename to src/addons/metamod/plugins.ini
diff --git a/gamedir/addons/stripper2/dlls/stripper2_mm.so b/src/addons/stripper2/dlls/stripper2_mm.so
similarity index 100%
rename from gamedir/addons/stripper2/dlls/stripper2_mm.so
rename to src/addons/stripper2/dlls/stripper2_mm.so
diff --git a/gamedir/autoexec.cfg b/src/autoexec.cfg
similarity index 100%
rename from gamedir/autoexec.cfg
rename to src/autoexec.cfg
diff --git a/gamedir/default.cfg b/src/default.cfg
similarity index 100%
rename from gamedir/default.cfg
rename to src/default.cfg
diff --git a/gamedir/liblist.gam b/src/liblist.gam
similarity index 100%
rename from gamedir/liblist.gam
rename to src/liblist.gam
diff --git a/gamedir/mapcycle.txt b/src/mapcycle.txt
similarity index 100%
rename from gamedir/mapcycle.txt
rename to src/mapcycle.txt
diff --git a/gamedir/maps/crossfire_str.cfg b/src/maps/crossfire_str.cfg
similarity index 100%
rename from gamedir/maps/crossfire_str.cfg
rename to src/maps/crossfire_str.cfg
diff --git a/gamedir/motd.txt b/src/motd.txt
similarity index 100%
rename from gamedir/motd.txt
rename to src/motd.txt
diff --git a/gamedir/server.cfg b/src/server.cfg
similarity index 100%
rename from gamedir/server.cfg
rename to src/server.cfg
diff --git a/gamedir/stripper2.cfg b/src/stripper2.cfg
similarity index 100%
rename from gamedir/stripper2.cfg
rename to src/stripper2.cfg