diff --git a/.idea/runConfigurations/BNLS.xml b/.idea/runConfigurations/BNLS.xml
index d2ef0f3b..bf88d4cd 100644
--- a/.idea/runConfigurations/BNLS.xml
+++ b/.idea/runConfigurations/BNLS.xml
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="BNLS" type="Application" factoryName="Application" folderName="server" singleton="true">
-    <option name="MAIN_CLASS_NAME" value="com.riiablo.server.BNLS" />
-    <module name="server" />
+    <option name="MAIN_CLASS_NAME" value="com.riiablo.server.bnls.BNLS" />
+    <module name="bnls" />
     <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
     <method />
   </configuration>
diff --git a/.idea/runConfigurations/Server_Browser.xml b/.idea/runConfigurations/Server_Browser.xml
deleted file mode 100644
index bf41fdb4..00000000
--- a/.idea/runConfigurations/Server_Browser.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Server Browser" type="Application" factoryName="Application" folderName="server" singleton="true">
-    <option name="MAIN_CLASS_NAME" value="com.riiablo.server.ServerBrowser" />
-    <module name="server" />
-    <option name="PROGRAM_PARAMETERS" value="-fps -w -logLevel debug -home &quot;C:\Program Files (x86)\Steam\steamapps\common\Diablo II&quot;" />
-    <option name="VM_PARAMETERS" value="-ea" />
-    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/android/assets" />
-    <method />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 9d4b4487..11b5b89d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -216,7 +216,7 @@ project(":core") {
     }
 }
 
-project(":server") {
+project(":server:bnls") {
     apply plugin: "java"
 
     dependencies {
diff --git a/server/build.gradle b/server/bnls/build.gradle
similarity index 92%
rename from server/build.gradle
rename to server/bnls/build.gradle
index 2d2921ad..c7ec3e5d 100644
--- a/server/build.gradle
+++ b/server/bnls/build.gradle
@@ -4,7 +4,7 @@ sourceCompatibility = 1.7
 sourceSets.main.java.srcDirs = [ "src/" ]
 sourceSets.test.java.srcDirs = [ "test/" ]
 
-project.ext.mainClassName = "com.riiablo.server.ServerBrowser"
+project.ext.mainClassName = "com.riiablo.server.bnls.BNLS"
 project.ext.assetsDir = new File("../android/assets");
 
 task run(dependsOn: classes, type: JavaExec) {
diff --git a/server/src/com/riiablo/server/BNLS.java b/server/bnls/src/com/riiablo/server/bnls/BNLS.java
similarity index 99%
rename from server/src/com/riiablo/server/BNLS.java
rename to server/bnls/src/com/riiablo/server/bnls/BNLS.java
index e9f0ac8c..c3483342 100644
--- a/server/src/com/riiablo/server/BNLS.java
+++ b/server/bnls/src/com/riiablo/server/bnls/BNLS.java
@@ -1,4 +1,4 @@
-package com.riiablo.server;
+package com.riiablo.server.bnls;
 
 import com.google.flatbuffers.FlatBufferBuilder;
 
diff --git a/server/test/com/riiablo/server/BNLSTest.java b/server/bnls/test/com/riiablo/server/bnls/BNLSTest.java
similarity index 98%
rename from server/test/com/riiablo/server/BNLSTest.java
rename to server/bnls/test/com/riiablo/server/bnls/BNLSTest.java
index 0f68353a..08fdc68d 100644
--- a/server/test/com/riiablo/server/BNLSTest.java
+++ b/server/bnls/test/com/riiablo/server/bnls/BNLSTest.java
@@ -1,4 +1,4 @@
-package com.riiablo.server;
+package com.riiablo.server.bnls;
 
 import com.google.flatbuffers.FlatBufferBuilder;
 
diff --git a/settings.gradle b/settings.gradle
index 36061c00..244cbcfe 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include 'tools', 'tester', 'ds1viewer', 'mpqviewer', 'server', 'desktop', 'android', 'mpqlib', 'core'
\ No newline at end of file
+include 'tools', 'tester', 'ds1viewer', 'mpqviewer', 'server:bnls', 'desktop', 'android', 'mpqlib', 'core'
\ No newline at end of file