diff --git a/Makefile b/Makefile
deleted file mode 100644
index b473d7f..0000000
--- a/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-ERLC=`which erlc`
-BEAMDIR=./ebin
-ERLCFLAGS=+debug_info -pa $(BEAMDIR)
-SRCDIR=src
-
-.PHONY=all clean
-
-all:
-	@echo "Erlware Commons is maintained with Sinan, its much better to use "
-	@echo "sinan to build than this makefile. This is here just to get "
-	@echo "get you started."
-	$(ERLC) $(ERLCFLAGS) -o $(BEAMDIR) $(SRCDIR)/ec_dictionary.erl;
-	$(ERLC) $(ERLCFLAGS) -o $(BEAMDIR) $(SRCDIR)/*.erl ;
-
-clean:
-	rm $(BEAMDIR)/*.beam
-	rm -rf erl_crush.dump
\ No newline at end of file
diff --git a/rebar.config b/rebar.config
new file mode 100644
index 0000000..27aa310
--- /dev/null
+++ b/rebar.config
@@ -0,0 +1,3 @@
+{erl_opts,
+ [debug_info,
+  warnings_as_errors]}.
\ No newline at end of file
diff --git a/ebin/erlware_commons.app b/src/erlware_commons.app.src
similarity index 96%
rename from ebin/erlware_commons.app
rename to src/erlware_commons.app.src
index 4c4b057..a10e939 100644
--- a/ebin/erlware_commons.app
+++ b/src/erlware_commons.app.src
@@ -1,7 +1,7 @@
 %% -*- mode: Erlang; fill-column: 75; comment-column: 50; -*-
 {application, erlware_commons,
  [{description, "Additional standard library for Erlang"},
-  {vsn, "0.6.2"},
+  {vsn, "0.7.0"},
   {modules, [
              ec_talk,
              ec_lists,