diff --git a/bukkit-plugin/.classpath b/bukkit-plugin/.classpath
deleted file mode 100644
index bb25a46..0000000
--- a/bukkit-plugin/.classpath
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="/home/walter/bukkit/target/bukkit-1.4.6-R0.4-SNAPSHOT.jar" sourcepath="/home/walter/bukkit/src/main/java">
-		<attributes>
-			<attribute name="javadoc_location" value="http://jd.bukkit.org/apidocs/"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bukkit-plugin/.project b/bukkit-plugin/.project
deleted file mode 100644
index 2709178..0000000
--- a/bukkit-plugin/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>ScriptCraft</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/bukkit-plugin/src/net/walterhiggins/scriptcraft/ScriptCraftPlugin.java b/src/main/java/net/walterhiggins/scriptcraft/ScriptCraftPlugin.java
similarity index 100%
rename from bukkit-plugin/src/net/walterhiggins/scriptcraft/ScriptCraftPlugin.java
rename to src/main/java/net/walterhiggins/scriptcraft/ScriptCraftPlugin.java
diff --git a/js-plugins/alias/alias.js b/src/main/javascript/alias/alias.js
similarity index 100%
rename from js-plugins/alias/alias.js
rename to src/main/javascript/alias/alias.js
diff --git a/js-plugins/arrows/arrows.js b/src/main/javascript/arrows/arrows.js
similarity index 100%
rename from js-plugins/arrows/arrows.js
rename to src/main/javascript/arrows/arrows.js
diff --git a/js-plugins/core/_primitives.js b/src/main/javascript/core/_primitives.js
similarity index 100%
rename from js-plugins/core/_primitives.js
rename to src/main/javascript/core/_primitives.js
diff --git a/js-plugins/core/_scriptcraft.js b/src/main/javascript/core/_scriptcraft.js
similarity index 100%
rename from js-plugins/core/_scriptcraft.js
rename to src/main/javascript/core/_scriptcraft.js
diff --git a/js-plugins/drone/blocktype.js b/src/main/javascript/drone/blocktype.js
similarity index 100%
rename from js-plugins/drone/blocktype.js
rename to src/main/javascript/drone/blocktype.js
diff --git a/js-plugins/drone/castle.js b/src/main/javascript/drone/castle.js
similarity index 100%
rename from js-plugins/drone/castle.js
rename to src/main/javascript/drone/castle.js
diff --git a/js-plugins/drone/cottage.js b/src/main/javascript/drone/cottage.js
similarity index 100%
rename from js-plugins/drone/cottage.js
rename to src/main/javascript/drone/cottage.js
diff --git a/js-plugins/drone/dancefloor.js b/src/main/javascript/drone/dancefloor.js
similarity index 100%
rename from js-plugins/drone/dancefloor.js
rename to src/main/javascript/drone/dancefloor.js
diff --git a/js-plugins/drone/drone.js b/src/main/javascript/drone/drone.js
similarity index 100%
rename from js-plugins/drone/drone.js
rename to src/main/javascript/drone/drone.js
diff --git a/js-plugins/drone/fort.js b/src/main/javascript/drone/fort.js
similarity index 100%
rename from js-plugins/drone/fort.js
rename to src/main/javascript/drone/fort.js
diff --git a/js-plugins/drone/sphere.js b/src/main/javascript/drone/sphere.js
similarity index 100%
rename from js-plugins/drone/sphere.js
rename to src/main/javascript/drone/sphere.js
diff --git a/js-plugins/drone/temple.js b/src/main/javascript/drone/temple.js
similarity index 100%
rename from js-plugins/drone/temple.js
rename to src/main/javascript/drone/temple.js
diff --git a/js-plugins/events/events.js b/src/main/javascript/events/events.js
similarity index 100%
rename from js-plugins/events/events.js
rename to src/main/javascript/events/events.js
diff --git a/js-plugins/ext/json2.js b/src/main/javascript/ext/json2.js
similarity index 100%
rename from js-plugins/ext/json2.js
rename to src/main/javascript/ext/json2.js
diff --git a/js-plugins/homes/homes.js b/src/main/javascript/homes/homes.js
similarity index 100%
rename from js-plugins/homes/homes.js
rename to src/main/javascript/homes/homes.js
diff --git a/js-plugins/signs/menu.js b/src/main/javascript/signs/menu.js
similarity index 100%
rename from js-plugins/signs/menu.js
rename to src/main/javascript/signs/menu.js
diff --git a/bukkit-plugin/plugin.yml b/src/main/resources/plugin.yml
similarity index 100%
rename from bukkit-plugin/plugin.yml
rename to src/main/resources/plugin.yml