diff --git a/Player/Alias.cs b/Commands/Alias.cs
similarity index 97%
rename from Player/Alias.cs
rename to Commands/Alias.cs
index 4de03c668..15b351e3c 100644
--- a/Player/Alias.cs
+++ b/Commands/Alias.cs
@@ -1,23 +1,23 @@
-/*
-    Copyright 2015 MCGalaxy
-        
-    Dual-licensed under the Educational Community License, Version 2.0 and
-    the GNU General Public License, Version 3 (the "Licenses"); you may
-    not use this file except in compliance with the Licenses. You may
-    obtain a copy of the Licenses at
-    
-    http://www.opensource.org/licenses/ecl2.php
-    http://www.gnu.org/licenses/gpl-3.0.html
-    
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the Licenses are distributed on an "AS IS"
-    BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-    or implied. See the Licenses for the specific language governing
-    permissions and limitations under the Licenses.
- */
-using System;
-using System.Collections.Generic;
-using System.IO;
+/*
+    Copyright 2015 MCGalaxy
+        
+    Dual-licensed under the Educational Community License, Version 2.0 and
+    the GNU General Public License, Version 3 (the "Licenses"); you may
+    not use this file except in compliance with the Licenses. You may
+    obtain a copy of the Licenses at
+    
+    http://www.opensource.org/licenses/ecl2.php
+    http://www.gnu.org/licenses/gpl-3.0.html
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the Licenses are distributed on an "AS IS"
+    BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+    or implied. See the Licenses for the specific language governing
+    permissions and limitations under the Licenses.
+ */
+using System;
+using System.Collections.Generic;
+using System.IO;
 
 namespace MCGalaxy {
     
@@ -50,7 +50,9 @@ namespace MCGalaxy {
         }
 
         public static void Load(){
-            aliases = new List<Alias>();
+            aliases.Clear();
+            coreAliases.Clear();
+            
             if (!File.Exists(file)) { Save(); return; }
             PropertiesFile.Read(file, LineProcessor, ':');
         }
diff --git a/MCGalaxy_.csproj b/MCGalaxy_.csproj
index 0055315d2..771168e60 100644
--- a/MCGalaxy_.csproj
+++ b/MCGalaxy_.csproj
@@ -125,6 +125,7 @@
     <Compile Include="Chat\FullCP437Handler.cs" />
     <Compile Include="Chat\ChatTokens.cs" />
     <Compile Include="Chat\LineWrapper.cs" />
+    <Compile Include="Commands\Alias.cs" />
     <Compile Include="Commands\Bots\CmdBotAdd.cs" />
     <Compile Include="Commands\Bots\CmdBotAI.cs" />
     <Compile Include="Commands\Bots\CmdBotRemove.cs" />
@@ -575,7 +576,6 @@
     <Compile Include="Network\NetUtils.cs" />
     <Compile Include="Network\Opcode.cs" />
     <Compile Include="Network\Player.Networking.cs" />
-    <Compile Include="Player\Alias.cs" />
     <Compile Include="API\API.cs" />
     <Compile Include="Plugins\Plugin.cs" />
     <Compile Include="Plugins\Plugin.Events.cs" />