diff --git a/.gitignore b/.gitignore
index c1459c4..277d895 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,7 @@ classes/
 lib/
 *.jar
 /storm-kafka/target/
-/storm-kafka/.idea/
\ No newline at end of file
+/storm-kafka/.idea/
+.project
+.classpath
+.settings
diff --git a/pom.xml b/pom.xml
index 9d5bf1e..a88a74c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,36 +1,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
+	<modelVersion>4.0.0</modelVersion>
 
-  <groupId>storm</groupId>
-  <artifactId>storm-contrib</artifactId>
-  <version>0.1-SNAPSHOT</version>
-  <packaging>pom</packaging>
-  <name>storm-contrib</name>
-  <description>A collection of spouts, bolts, serializers, DSLs, and other goodies to use with Storm</description>
-  <url>http://github.com/nathanmarz/storm-contrib</url>
+	<groupId>storm</groupId>
+	<artifactId>storm-contrib</artifactId>
+	<version>0.1-SNAPSHOT</version>
+	<packaging>pom</packaging>
+	<name>storm-contrib</name>
+	<description>A collection of spouts, bolts, serializers, DSLs, and other goodies to use with Storm</description>
+	<url>http://github.com/nathanmarz/storm-contrib</url>
 
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>storm</groupId>
-        <artifactId>storm</artifactId>
-        <version>0.6.1</version>
-        <scope>provided</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>storm</groupId>
+				<artifactId>storm</artifactId>
+				<version>0.9.0-wip15</version>
+				<scope>provided</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
 
-  <repositories>
-    <repository>
-      <id>clojars</id>
-      <url>http://clojars.org/repo/</url>
-    </repository>
-  </repositories>
+	<repositories>
+		<repository>
+			<id>clojars</id>
+			<url>http://clojars.org/repo/</url>
+		</repository>
+	</repositories>
 
-  <modules>
-    <module>storm-contrib-core</module>
-    <module>storm-contrib-mongo</module>
-    <module>storm-contrib-sqs</module>
-  </modules>
+	<modules>
+		<module>storm-kafka</module>
+		<module>storm-rdbms</module>
+
+		<module>storm-contrib-clockspout</module>
+		<module>storm-hbase</module>
+		<module>storm-mongo</module>
+		<module>storm-signals</module>
+		<module>storm-cassandra</module>
+		<module>storm-jms</module>
+		<module>storm-growl</module>
+		<module>storm-sqs</module> 
+	</modules>
 </project>
diff --git a/storm-kafka/project.clj b/storm-kafka/project.clj
deleted file mode 100644
index 0f5a0f7..0000000
--- a/storm-kafka/project.clj
+++ /dev/null
@@ -1,15 +0,0 @@
-(defproject storm/storm-kafka "0.9.0-wip16b-scala292"
-  :java-source-paths ["src/jvm"]
-  :repositories {"scala-tools" "http://scala-tools.org/repo-releases"
-                  "conjars" "http://conjars.org/repo/"}
-  :dependencies [[org.scala-lang/scala-library "2.9.2"]
-                  [com.twitter/kafka_2.9.2 "0.7.0"
-                  :exclusions [org.apache.zookeeper/zookeeper
-                               log4j/log4j]]]
-  :profiles
-  {:provided {:dependencies [[storm "0.9.0-wip15"]
-                             [org.slf4j/log4j-over-slf4j "1.6.6"]
-                             ;;[ch.qos.logback/logback-classic "1.0.6"]
-                             [org.clojure/clojure "1.4.0"]]}}
-  :jvm-opts ["-Djava.library.path=/usr/local/lib:/opt/local/lib:/usr/lib"]
-  :min-lein-version "2.0")
diff --git a/storm-kafka/src/jvm/storm/kafka/DynamicBrokersReader.java b/storm-kafka/src/main/java/storm/kafka/DynamicBrokersReader.java
similarity index 100%
rename from storm-kafka/src/jvm/storm/kafka/DynamicBrokersReader.java
rename to storm-kafka/src/main/java/storm/kafka/DynamicBrokersReader.java
diff --git a/storm-kafka/src/jvm/storm/kafka/DynamicPartitionConnections.java b/storm-kafka/src/main/java/storm/kafka/DynamicPartitionConnections.java
similarity index 100%
rename from storm-kafka/src/jvm/storm/kafka/DynamicPartitionConnections.java
rename to storm-kafka/src/main/java/storm/kafka/DynamicPartitionConnections.java
diff --git a/storm-kafka/src/jvm/storm/kafka/GlobalPartitionId.java b/storm-kafka/src/main/java/storm/kafka/GlobalPartitionId.java
similarity index 100%
rename from storm-kafka/src/jvm/storm/kafka/GlobalPartitionId.java
rename to storm-kafka/src/main/java/storm/kafka/GlobalPartitionId.java
diff --git a/storm-kafka/src/jvm/storm/kafka/HostPort.java b/storm-kafka/src/main/java/storm/kafka/HostPort.java
similarity index 100%
rename from storm-kafka/src/jvm/storm/kafka/HostPort.java
rename to storm-kafka/src/main/java/storm/kafka/HostPort.java
diff --git a/storm-kafka/src/jvm/storm/kafka/KafkaConfig.java b/storm-kafka/src/main/java/storm/kafka/KafkaConfig.java
similarity index 100%
rename from storm-kafka/src/jvm/storm/kafka/KafkaConfig.java
rename to storm-kafka/src/main/java/storm/kafka/KafkaConfig.java
diff --git a/storm-kafka/src/jvm/storm/kafka/KafkaSpout.java b/storm-kafka/src/main/java/storm/kafka/KafkaSpout.java
similarity index 100%
rename from storm-kafka/src/jvm/storm/kafka/KafkaSpout.java
rename to storm-kafka/src/main/java/storm/kafka/KafkaSpout.java
diff --git a/storm-kafka/src/jvm/storm/kafka/PartitionCoordinator.java b/storm-kafka/src/main/java/storm/kafka/PartitionCoordinator.java
similarity index 100%
rename from storm-kafka/src/jvm/storm/kafka/PartitionCoordinator.java
rename to storm-kafka/src/main/java/storm/kafka/PartitionCoordinator.java
diff --git a/storm-kafka/src/jvm/storm/kafka/PartitionManager.java b/storm-kafka/src/main/java/storm/kafka/PartitionManager.java
similarity index 100%
rename from storm-kafka/src/jvm/storm/kafka/PartitionManager.java
rename to storm-kafka/src/main/java/storm/kafka/PartitionManager.java
diff --git a/storm-kafka/src/jvm/storm/kafka/SpoutConfig.java b/storm-kafka/src/main/java/storm/kafka/SpoutConfig.java
similarity index 100%
rename from storm-kafka/src/jvm/storm/kafka/SpoutConfig.java
rename to storm-kafka/src/main/java/storm/kafka/SpoutConfig.java
diff --git a/storm-kafka/src/jvm/storm/kafka/StaticCoordinator.java b/storm-kafka/src/main/java/storm/kafka/StaticCoordinator.java
similarity index 100%
rename from storm-kafka/src/jvm/storm/kafka/StaticCoordinator.java
rename to storm-kafka/src/main/java/storm/kafka/StaticCoordinator.java
diff --git a/storm-kafka/src/jvm/storm/kafka/StaticPartitionConnections.java b/storm-kafka/src/main/java/storm/kafka/StaticPartitionConnections.java
similarity index 100%
rename from storm-kafka/src/jvm/storm/kafka/StaticPartitionConnections.java
rename to storm-kafka/src/main/java/storm/kafka/StaticPartitionConnections.java
diff --git a/storm-kafka/src/jvm/storm/kafka/StringScheme.java b/storm-kafka/src/main/java/storm/kafka/StringScheme.java
similarity index 100%
rename from storm-kafka/src/jvm/storm/kafka/StringScheme.java
rename to storm-kafka/src/main/java/storm/kafka/StringScheme.java
diff --git a/storm-kafka/src/jvm/storm/kafka/TestTopology.java b/storm-kafka/src/main/java/storm/kafka/TestTopology.java
similarity index 100%
rename from storm-kafka/src/jvm/storm/kafka/TestTopology.java
rename to storm-kafka/src/main/java/storm/kafka/TestTopology.java
diff --git a/storm-kafka/src/jvm/storm/kafka/ZkCoordinator.java b/storm-kafka/src/main/java/storm/kafka/ZkCoordinator.java
similarity index 100%
rename from storm-kafka/src/jvm/storm/kafka/ZkCoordinator.java
rename to storm-kafka/src/main/java/storm/kafka/ZkCoordinator.java
diff --git a/storm-kafka/src/jvm/storm/kafka/ZkState.java b/storm-kafka/src/main/java/storm/kafka/ZkState.java
similarity index 100%
rename from storm-kafka/src/jvm/storm/kafka/ZkState.java
rename to storm-kafka/src/main/java/storm/kafka/ZkState.java
diff --git a/storm-kafka/src/jvm/storm/kafka/trident/DefaultCoordinator.java b/storm-kafka/src/main/java/storm/kafka/trident/DefaultCoordinator.java
similarity index 100%
rename from storm-kafka/src/jvm/storm/kafka/trident/DefaultCoordinator.java
rename to storm-kafka/src/main/java/storm/kafka/trident/DefaultCoordinator.java
diff --git a/storm-kafka/src/jvm/storm/kafka/trident/FailedFetchException.java b/storm-kafka/src/main/java/storm/kafka/trident/FailedFetchException.java
similarity index 100%
rename from storm-kafka/src/jvm/storm/kafka/trident/FailedFetchException.java
rename to storm-kafka/src/main/java/storm/kafka/trident/FailedFetchException.java
diff --git a/storm-kafka/src/jvm/storm/kafka/trident/IBatchCoordinator.java b/storm-kafka/src/main/java/storm/kafka/trident/IBatchCoordinator.java
similarity index 100%
rename from storm-kafka/src/jvm/storm/kafka/trident/IBatchCoordinator.java
rename to storm-kafka/src/main/java/storm/kafka/trident/IBatchCoordinator.java
diff --git a/storm-kafka/src/jvm/storm/kafka/trident/IBrokerReader.java b/storm-kafka/src/main/java/storm/kafka/trident/IBrokerReader.java
similarity index 100%
rename from storm-kafka/src/jvm/storm/kafka/trident/IBrokerReader.java
rename to storm-kafka/src/main/java/storm/kafka/trident/IBrokerReader.java
diff --git a/storm-kafka/src/jvm/storm/kafka/trident/KafkaUtils.java b/storm-kafka/src/main/java/storm/kafka/trident/KafkaUtils.java
similarity index 100%
rename from storm-kafka/src/jvm/storm/kafka/trident/KafkaUtils.java
rename to storm-kafka/src/main/java/storm/kafka/trident/KafkaUtils.java
diff --git a/storm-kafka/src/jvm/storm/kafka/trident/MaxMetric.java b/storm-kafka/src/main/java/storm/kafka/trident/MaxMetric.java
similarity index 100%
rename from storm-kafka/src/jvm/storm/kafka/trident/MaxMetric.java
rename to storm-kafka/src/main/java/storm/kafka/trident/MaxMetric.java
diff --git a/storm-kafka/src/jvm/storm/kafka/trident/OpaqueTridentKafkaSpout.java b/storm-kafka/src/main/java/storm/kafka/trident/OpaqueTridentKafkaSpout.java
similarity index 100%
rename from storm-kafka/src/jvm/storm/kafka/trident/OpaqueTridentKafkaSpout.java
rename to storm-kafka/src/main/java/storm/kafka/trident/OpaqueTridentKafkaSpout.java
diff --git a/storm-kafka/src/jvm/storm/kafka/trident/StaticBrokerReader.java b/storm-kafka/src/main/java/storm/kafka/trident/StaticBrokerReader.java
similarity index 100%
rename from storm-kafka/src/jvm/storm/kafka/trident/StaticBrokerReader.java
rename to storm-kafka/src/main/java/storm/kafka/trident/StaticBrokerReader.java
diff --git a/storm-kafka/src/jvm/storm/kafka/trident/TransactionalTridentKafkaSpout.java b/storm-kafka/src/main/java/storm/kafka/trident/TransactionalTridentKafkaSpout.java
similarity index 100%
rename from storm-kafka/src/jvm/storm/kafka/trident/TransactionalTridentKafkaSpout.java
rename to storm-kafka/src/main/java/storm/kafka/trident/TransactionalTridentKafkaSpout.java
diff --git a/storm-kafka/src/jvm/storm/kafka/trident/TridentKafkaConfig.java b/storm-kafka/src/main/java/storm/kafka/trident/TridentKafkaConfig.java
similarity index 100%
rename from storm-kafka/src/jvm/storm/kafka/trident/TridentKafkaConfig.java
rename to storm-kafka/src/main/java/storm/kafka/trident/TridentKafkaConfig.java
diff --git a/storm-kafka/src/jvm/storm/kafka/trident/ZkBrokerReader.java b/storm-kafka/src/main/java/storm/kafka/trident/ZkBrokerReader.java
similarity index 100%
rename from storm-kafka/src/jvm/storm/kafka/trident/ZkBrokerReader.java
rename to storm-kafka/src/main/java/storm/kafka/trident/ZkBrokerReader.java