diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 0000000..e69de29
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..e69de29
diff --git a/Makefile.am b/Makefile.am
index 1d2aa80..ade9076 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,17 +1 @@
-
-AM_CFLAGS = -D_GNU_SOURCE
-AM_CPPFLAGS =  -I$(includedir)/pacemaker -I$(includedir)/clplumbing \
-		-I$(includedir)/heartbeat \
-		$(glib_CFLAGS) \
-		$(libxml_CFLAGS)
-
-agentdir = $(libdir)/stonith/plugins/external
-agent_SCRIPTS = sbd.agent
-
-sbin_PROGRAMS = sbd
-
-sbd_SOURCES = sbd-common.c sbd-md.c sbd-pacemaker.c
-
-sbd_LDFLAGS = $(glib_LIBS) $(libcoroipcc_LIBS)
-
-
+SUBDIRS = src agent
diff --git a/NEWS b/NEWS
new file mode 100644
index 0000000..e69de29
diff --git a/README b/README
new file mode 100644
index 0000000..e69de29
diff --git a/agent/Makefile.am b/agent/Makefile.am
new file mode 100644
index 0000000..1994ba4
--- /dev/null
+++ b/agent/Makefile.am
@@ -0,0 +1,3 @@
+agentdir = $(libdir)/stonith/plugins/external
+agent_SCRIPTS = sbd
+
diff --git a/sbd.agent b/agent/sbd
similarity index 100%
rename from sbd.agent
rename to agent/sbd
diff --git a/configure.ac b/configure.ac
index 86fa895..c654a9c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,7 +50,7 @@ fi
 
 
 dnl The Makefiles and shell scripts we output
-AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([Makefile src/Makefile agent/Makefile])
 
 dnl Now process the entire list of files added by previous 
 dnl  calls to AC_CONFIG_FILES()
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 0000000..dcbb06b
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,12 @@
+AM_CFLAGS = -D_GNU_SOURCE
+AM_CPPFLAGS =  -I$(includedir)/pacemaker -I$(includedir)/clplumbing \
+		-I$(includedir)/heartbeat \
+		$(glib_CFLAGS) \
+		$(libxml_CFLAGS)
+
+sbin_PROGRAMS = sbd
+
+sbd_SOURCES = sbd-common.c sbd-md.c sbd-pacemaker.c
+
+sbd_LDFLAGS = $(glib_LIBS) $(libcoroipcc_LIBS)
+
diff --git a/sbd-common.c b/src/sbd-common.c
similarity index 100%
rename from sbd-common.c
rename to src/sbd-common.c
diff --git a/sbd-md.c b/src/sbd-md.c
similarity index 100%
rename from sbd-md.c
rename to src/sbd-md.c
diff --git a/sbd-pacemaker.c b/src/sbd-pacemaker.c
similarity index 100%
rename from sbd-pacemaker.c
rename to src/sbd-pacemaker.c
diff --git a/sbd.h b/src/sbd.h
similarity index 100%
rename from sbd.h
rename to src/sbd.h