diff --git a/server/IDEs/netbeans/manifest.mf b/server/IDEs/netbeans/manifest.mf
new file mode 100644
index 000000000..328e8e5bc
--- /dev/null
+++ b/server/IDEs/netbeans/manifest.mf
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+X-COMMENT: Main-Class will be added automatically by build
+
diff --git a/server/.nbbuild.xml b/server/IDEs/netbeans/nbbuild.xml
similarity index 100%
rename from server/.nbbuild.xml
rename to server/IDEs/netbeans/nbbuild.xml
diff --git a/server/nbproject/build-impl.xml b/server/IDEs/netbeans/nbproject/build-impl.xml
similarity index 100%
rename from server/nbproject/build-impl.xml
rename to server/IDEs/netbeans/nbproject/build-impl.xml
diff --git a/server/nbproject/genfiles.properties b/server/IDEs/netbeans/nbproject/genfiles.properties
similarity index 75%
rename from server/nbproject/genfiles.properties
rename to server/IDEs/netbeans/nbproject/genfiles.properties
index aa71927d0..946f89204 100644
--- a/server/nbproject/genfiles.properties
+++ b/server/IDEs/netbeans/nbproject/genfiles.properties
@@ -1,6 +1,6 @@
-.nbbuild.xml.data.CRC32=487fecb3
-.nbbuild.xml.script.CRC32=2d82381a
-.nbbuild.xml.stylesheet.CRC32=28e38971@1.38.1.45
+nbbuild.xml.data.CRC32=487fecb3
+nbbuild.xml.script.CRC32=2d82381a
+nbbuild.xml.stylesheet.CRC32=28e38971@1.38.1.45
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
 nbproject/build-impl.xml.data.CRC32=487fecb3
diff --git a/server/nbproject/project.properties b/server/IDEs/netbeans/nbproject/project.properties
similarity index 78%
rename from server/nbproject/project.properties
rename to server/IDEs/netbeans/nbproject/project.properties
index 0e87ddabc..77edc8a14 100644
--- a/server/nbproject/project.properties
+++ b/server/IDEs/netbeans/nbproject/project.properties
@@ -7,14 +7,14 @@ application.vendor=dfhuynh
 build.classes.dir=${build.dir}/
 build.classes.excludes=**/*.java,**/*.form
 # This directory is removed when the project is cleaned:
-build.dir=classes
+build.dir=../../classes
 build.generated.dir=${build.dir}/generated
 build.generated.sources.dir=${build.dir}/generated-sources
 # Only compile against the classpath explicitly listed here:
 build.sysclasspath=ignore
 build.test.classes.dir=${build.dir}/test/classes
 build.test.results.dir=${build.dir}/test/results
-buildfile=.nbbuild.xml
+buildfile=nbbuild.xml
 # Uncomment to specify the preferred debugger connection transport:
 #debug.transport=dt_socket
 debug.classpath=\
@@ -27,16 +27,15 @@ dist.jar=${dist.dir}/gridworks server.jar
 dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=
-file.reference.butterfly-trunk.jar=../main/webapp/WEB-INF/lib/butterfly-trunk.jar
-file.reference.jdatapath-alpha2.jar=lib/jdatapath-alpha2.jar
-file.reference.jetty-6.1.22.jar=lib/jetty-6.1.22.jar
-file.reference.jetty-util-6.1.22.jar=lib/jetty-util-6.1.22.jar
-file.reference.log4j-1.2.15.jar=lib/log4j-1.2.15.jar
-file.reference.server-src=src
-file.reference.servlet-api-2.5.jar=lib/servlet-api-2.5.jar
-file.reference.slf4j-api-1.5.6.jar=lib/slf4j-api-1.5.6.jar
-file.reference.slf4j-log4j12-1.5.6.jar=lib/slf4j-log4j12-1.5.6.jar
-file.reference.WEB-INF-classes=../main/webapp/WEB-INF/classes
+file.reference.jdatapath-alpha2.jar=../../lib/jdatapath-alpha2.jar
+file.reference.jetty-6.1.22.jar=../../lib/jetty-6.1.22.jar
+file.reference.jetty-util-6.1.22.jar=../../lib/jetty-util-6.1.22.jar
+file.reference.log4j-1.2.15.jar=../../lib/log4j-1.2.15.jar
+file.reference.server-src=../../src
+file.reference.servlet-api-2.5.jar=../../lib/servlet-api-2.5.jar
+file.reference.slf4j-api-1.5.6.jar=../../lib/slf4j-api-1.5.6.jar
+file.reference.slf4j-log4j12-1.5.6.jar=../../lib/slf4j-log4j12-1.5.6.jar
+file.reference.WEB-INF-classes=../../../main/webapp/WEB-INF/classes/
 includes=**
 jar.compress=false
 javac.classpath=\
@@ -47,8 +46,7 @@ javac.classpath=\
     ${file.reference.servlet-api-2.5.jar}:\
     ${file.reference.slf4j-api-1.5.6.jar}:\
     ${file.reference.slf4j-log4j12-1.5.6.jar}:\
-    ${file.reference.WEB-INF-classes}:\
-    ${file.reference.butterfly-trunk.jar}
+    ${file.reference.WEB-INF-classes}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false
diff --git a/server/nbproject/project.xml b/server/IDEs/netbeans/nbproject/project.xml
similarity index 100%
rename from server/nbproject/project.xml
rename to server/IDEs/netbeans/nbproject/project.xml