diff --git a/apps/luwak/rebar.config b/apps/luwak/rebar.config
deleted file mode 100644
index 11acafe..0000000
--- a/apps/luwak/rebar.config
+++ /dev/null
@@ -1,2 +0,0 @@
-
-{erl_opts, [debug_info]}.
\ No newline at end of file
diff --git a/apps/luwak/doc/edoc-info b/doc/doc/edoc-info
similarity index 100%
rename from apps/luwak/doc/edoc-info
rename to doc/doc/edoc-info
diff --git a/apps/luwak/doc/erlang.png b/doc/doc/erlang.png
similarity index 100%
rename from apps/luwak/doc/erlang.png
rename to doc/doc/erlang.png
diff --git a/apps/luwak/doc/index.html b/doc/doc/index.html
similarity index 100%
rename from apps/luwak/doc/index.html
rename to doc/doc/index.html
diff --git a/apps/luwak/doc/luwak_app.html b/doc/doc/luwak_app.html
similarity index 100%
rename from apps/luwak/doc/luwak_app.html
rename to doc/doc/luwak_app.html
diff --git a/apps/luwak/doc/luwak_block.html b/doc/doc/luwak_block.html
similarity index 100%
rename from apps/luwak/doc/luwak_block.html
rename to doc/doc/luwak_block.html
diff --git a/apps/luwak/doc/luwak_file.html b/doc/doc/luwak_file.html
similarity index 100%
rename from apps/luwak/doc/luwak_file.html
rename to doc/doc/luwak_file.html
diff --git a/apps/luwak/doc/luwak_get_stream.html b/doc/doc/luwak_get_stream.html
similarity index 100%
rename from apps/luwak/doc/luwak_get_stream.html
rename to doc/doc/luwak_get_stream.html
diff --git a/apps/luwak/doc/luwak_io.html b/doc/doc/luwak_io.html
similarity index 100%
rename from apps/luwak/doc/luwak_io.html
rename to doc/doc/luwak_io.html
diff --git a/apps/luwak/doc/luwak_put_stream.html b/doc/doc/luwak_put_stream.html
similarity index 100%
rename from apps/luwak/doc/luwak_put_stream.html
rename to doc/doc/luwak_put_stream.html
diff --git a/apps/luwak/doc/luwak_sup.html b/doc/doc/luwak_sup.html
similarity index 100%
rename from apps/luwak/doc/luwak_sup.html
rename to doc/doc/luwak_sup.html
diff --git a/apps/luwak/doc/luwak_tree.html b/doc/doc/luwak_tree.html
similarity index 100%
rename from apps/luwak/doc/luwak_tree.html
rename to doc/doc/luwak_tree.html
diff --git a/apps/luwak/doc/luwak_tree_utils.html b/doc/doc/luwak_tree_utils.html
similarity index 100%
rename from apps/luwak/doc/luwak_tree_utils.html
rename to doc/doc/luwak_tree_utils.html
diff --git a/apps/luwak/doc/modules-frame.html b/doc/doc/modules-frame.html
similarity index 100%
rename from apps/luwak/doc/modules-frame.html
rename to doc/doc/modules-frame.html
diff --git a/apps/luwak/doc/overview-summary.html b/doc/doc/overview-summary.html
similarity index 100%
rename from apps/luwak/doc/overview-summary.html
rename to doc/doc/overview-summary.html
diff --git a/apps/luwak/doc/packages-frame.html b/doc/doc/packages-frame.html
similarity index 100%
rename from apps/luwak/doc/packages-frame.html
rename to doc/doc/packages-frame.html
diff --git a/apps/luwak/doc/stylesheet.css b/doc/doc/stylesheet.css
similarity index 100%
rename from apps/luwak/doc/stylesheet.css
rename to doc/doc/stylesheet.css
diff --git a/apps/luwak/ebin/luwak.app b/ebin/luwak.app
similarity index 100%
rename from apps/luwak/ebin/luwak.app
rename to ebin/luwak.app
diff --git a/apps/luwak/include/luwak.hrl b/include/luwak.hrl
similarity index 100%
rename from apps/luwak/include/luwak.hrl
rename to include/luwak.hrl
diff --git a/rebar.config b/rebar.config
index c886101..746d73b 100644
--- a/rebar.config
+++ b/rebar.config
@@ -1,6 +1,2 @@
-{lib_dirs, ["apps", "deps"]}.
-
-{sub_dirs, [
-  "apps/luwak", 
-  "apps/skerl"]}.
+{lib_dirs, ["deps"]}.
 
diff --git a/apps/luwak/src/luwak_app.erl b/src/luwak_app.erl
similarity index 100%
rename from apps/luwak/src/luwak_app.erl
rename to src/luwak_app.erl
diff --git a/apps/luwak/src/luwak_block.erl b/src/luwak_block.erl
similarity index 92%
rename from apps/luwak/src/luwak_block.erl
rename to src/luwak_block.erl
index 3d364f6..58cd0e2 100644
--- a/apps/luwak/src/luwak_block.erl
+++ b/src/luwak_block.erl
@@ -1,6 +1,6 @@
 -module(luwak_block).
 
--include_lib("luwak/include/luwak.hrl").
+-include_lib("luwak.hrl").
 
 -export([create/2,
          data/1,
diff --git a/apps/luwak/src/luwak_checksum.erl b/src/luwak_checksum.erl
similarity index 100%
rename from apps/luwak/src/luwak_checksum.erl
rename to src/luwak_checksum.erl
diff --git a/apps/luwak/src/luwak_file.erl b/src/luwak_file.erl
similarity index 99%
rename from apps/luwak/src/luwak_file.erl
rename to src/luwak_file.erl
index 5df373f..058f825 100644
--- a/apps/luwak/src/luwak_file.erl
+++ b/src/luwak_file.erl
@@ -13,7 +13,7 @@
          name/1,
          length/2]).
 
--include_lib("luwak/include/luwak.hrl").
+-include_lib("luwak.hrl").
 
 %% @spec create(Riak :: riak(), Name :: binary(), Attributes :: dict())
 %%        -> {ok, File :: luwak_file()}
diff --git a/apps/luwak/src/luwak_get_stream.erl b/src/luwak_get_stream.erl
similarity index 99%
rename from apps/luwak/src/luwak_get_stream.erl
rename to src/luwak_get_stream.erl
index 326fd8f..7478550 100644
--- a/apps/luwak/src/luwak_get_stream.erl
+++ b/src/luwak_get_stream.erl
@@ -6,7 +6,7 @@
 
 -record(map, {riak,blocksize,ref,pid,offset,endoffset}).
 
--include_lib("luwak/include/luwak.hrl").
+-include_lib("luwak.hrl").
 
 
 %% @spec start(Riak :: riak(), File :: luwak_file(),
diff --git a/apps/luwak/src/luwak_io.erl b/src/luwak_io.erl
similarity index 99%
rename from apps/luwak/src/luwak_io.erl
rename to src/luwak_io.erl
index 4573d51..598ad06 100644
--- a/apps/luwak/src/luwak_io.erl
+++ b/src/luwak_io.erl
@@ -5,7 +5,7 @@
          truncate/3,
          no_tree_put_range/4]).
 
--include_lib("luwak/include/luwak.hrl").
+-include_lib("luwak.hrl").
 
 %% @spec put_range(Riak :: riak(), File :: luwak_file(),
 %%                 Start :: int(), Data :: binary()) ->
diff --git a/apps/luwak/src/luwak_put_stream.erl b/src/luwak_put_stream.erl
similarity index 99%
rename from apps/luwak/src/luwak_put_stream.erl
rename to src/luwak_put_stream.erl
index b1a0e5c..8118853 100644
--- a/apps/luwak/src/luwak_put_stream.erl
+++ b/src/luwak_put_stream.erl
@@ -4,7 +4,7 @@
 -record(state, {file,offset,blocksize,ref,ttl,written=[],buffer=[],
                 buffersize=0,checksumming=false,ctx=crypto:sha_init()}).
 
--include_lib("luwak/include/luwak.hrl").
+-include_lib("luwak.hrl").
 
 %% API
 -export([start_link/4,
diff --git a/apps/luwak/src/luwak_tree.erl b/src/luwak_tree.erl
similarity index 99%
rename from apps/luwak/src/luwak_tree.erl
rename to src/luwak_tree.erl
index 8f73974..2590a8b 100644
--- a/apps/luwak/src/luwak_tree.erl
+++ b/src/luwak_tree.erl
@@ -9,7 +9,7 @@
          truncate/7,
          truncate/1]).
 
--include_lib("luwak/include/luwak.hrl").
+-include_lib("luwak.hrl").
 
 %%=======================================
 %% Public API
diff --git a/apps/luwak/src/luwak_tree_utils.erl b/src/luwak_tree_utils.erl
similarity index 99%
rename from apps/luwak/src/luwak_tree_utils.erl
rename to src/luwak_tree_utils.erl
index 43ba148..7459b0f 100644
--- a/apps/luwak/src/luwak_tree_utils.erl
+++ b/src/luwak_tree_utils.erl
@@ -1,6 +1,6 @@
 -module(luwak_tree_utils).
 
--include_lib("luwak/include/luwak.hrl").
+-include_lib("luwak.hrl").
 
 -export([longest_divisable_subtree/2,
          longest_divisable_subtree/4, 
diff --git a/apps/luwak/test/luwak_checksum_tests.erl b/test/luwak_checksum_tests.erl
similarity index 100%
rename from apps/luwak/test/luwak_checksum_tests.erl
rename to test/luwak_checksum_tests.erl
diff --git a/apps/luwak/test/luwak_file_tests.erl b/test/luwak_file_tests.erl
similarity index 100%
rename from apps/luwak/test/luwak_file_tests.erl
rename to test/luwak_file_tests.erl
diff --git a/apps/luwak/test/luwak_get_stream_tests.erl b/test/luwak_get_stream_tests.erl
similarity index 100%
rename from apps/luwak/test/luwak_get_stream_tests.erl
rename to test/luwak_get_stream_tests.erl
diff --git a/apps/luwak/test/luwak_io_tests.erl b/test/luwak_io_tests.erl
similarity index 100%
rename from apps/luwak/test/luwak_io_tests.erl
rename to test/luwak_io_tests.erl
diff --git a/apps/luwak/test/luwak_put_stream_tests.erl b/test/luwak_put_stream_tests.erl
similarity index 100%
rename from apps/luwak/test/luwak_put_stream_tests.erl
rename to test/luwak_put_stream_tests.erl
diff --git a/apps/luwak/test/luwak_tree_tests.erl b/test/luwak_tree_tests.erl
similarity index 100%
rename from apps/luwak/test/luwak_tree_tests.erl
rename to test/luwak_tree_tests.erl
diff --git a/apps/luwak/test/luwak_tree_utils_tests.erl b/test/luwak_tree_utils_tests.erl
similarity index 100%
rename from apps/luwak/test/luwak_tree_utils_tests.erl
rename to test/luwak_tree_utils_tests.erl
diff --git a/apps/luwak/test/test_helper.erl b/test/test_helper.erl
similarity index 100%
rename from apps/luwak/test/test_helper.erl
rename to test/test_helper.erl