diff --git a/springloaded/build.gradle b/springloaded/build.gradle
index a29a83a..ca47988 100644
--- a/springloaded/build.gradle
+++ b/springloaded/build.gradle
@@ -41,8 +41,8 @@ task wrapper(type: Wrapper) {
 dependencies {
 	tools 'com.googlecode.jarjar:jarjar:1.3'
 
-	compile 'org.ow2.asm:asm:5.0.2'
-	compile 'org.ow2.asm:asm-tree:5.0.2'
+	compile 'org.ow2.asm:asm:5.2'
+	compile 'org.ow2.asm:asm-tree:5.2'
 
 	testCompile 'junit:junit:4.11'
 	
diff --git a/springloaded/src/main/java/org/springsource/loaded/agent/FileSystemWatcherInterface.java b/springloaded/src/main/java/org/springsource/loaded/agent/FileSystemWatcherInterface.java
new file mode 100644
index 0000000..225c729
--- /dev/null
+++ b/springloaded/src/main/java/org/springsource/loaded/agent/FileSystemWatcherInterface.java
@@ -0,0 +1,18 @@
+package org.springsource.loaded.agent;
+
+import java.io.File;
+
+public interface AbstractFileSystemWatcher {
+	/**
+	 * Shutdown the thread.
+	 */
+	public void shutdown();
+
+	/**
+	 * Add a new file to the list of those being monitored. If the file is something that can be watched, then this
+	 * method will cause the thread to start (if it hasn't already been started).
+	 *
+	 * @param fileToMonitor the file to start monitor
+	 */
+	public void register(File fileToMonitor);
+}
diff --git a/springloaded/src/main/java/org/springsource/loaded/agent/MacOsFileSystemWatcher.java b/springloaded/src/main/java/org/springsource/loaded/agent/MacOsFileSystemWatcher.java
new file mode 100644
index 0000000..476b38b
--- /dev/null
+++ b/springloaded/src/main/java/org/springsource/loaded/agent/MacOsFileSystemWatcher.java
@@ -0,0 +1,4 @@
+package org.springsource.loaded.agent;
+
+public class MacOsFileSystemWatcher {
+}
diff --git a/springloaded/src/main/java/org/springsource/loaded/agent/PollingFileSystemWatcher.java b/springloaded/src/main/java/org/springsource/loaded/agent/PollingFileSystemWatcher.java
new file mode 100644
index 0000000..f3e69fc
--- /dev/null
+++ b/springloaded/src/main/java/org/springsource/loaded/agent/PollingFileSystemWatcher.java
@@ -0,0 +1,4 @@
+package org.springsource.loaded.agent;
+
+public class PollingFileSystemWatcher {
+}
diff --git a/springloaded/src/test/java/org/springsource/loaded/test/FileSystemWatcherTests.java b/springloaded/src/test/java/org/springsource/loaded/test/PollingFileSystemWatcherTests.java
similarity index 100%
rename from springloaded/src/test/java/org/springsource/loaded/test/FileSystemWatcherTests.java
rename to springloaded/src/test/java/org/springsource/loaded/test/PollingFileSystemWatcherTests.java