diff --git a/ChangeLog.txt b/ChangeLog.txt
index 4870f5d5..14c40c34 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,6 +1,8 @@
 Version 0.9.0 (unreleased)
 ---------------
 * Fully support file access times
+* (for developers) New repository layout. All subrepositories have been merged to one directory
+* (for developers) Using CMake instead of biicode as build system
 
 Version 0.8.6
 ---------------
diff --git a/README.md b/README.md
index 56b09b5d..d8430e93 100644
--- a/README.md
+++ b/README.md
@@ -48,18 +48,16 @@ Building from source
 
 Requirements
 ------------
-  - [biicode](http://www.biicode.com/downloads)
-
-        # After installing, call
-        $ bii setup:cpp
-
   - GCC version >= 4.8 or Clang (TODO which minimal version?)
   - CMake version >= 3.3
   - libcurl4 (including development headers) 
+  - Boost libraries filesystem, system, chrono, thread in version >= 1.56
+  - Crypto++ >= 5.6.3 (TODO Lower minimal version possible?)
   - libFUSE >= 2.8.6 (including development headers)
 
         # Ubuntu
         $ sudo apt-get install libfuse-dev
+        TODO Other install commands
         
         # Fedora
         TODO
@@ -77,18 +75,11 @@ Build
 
  2. Build
 
-        $ bii init -L
-        $ bii configure -D CMAKE_BUILD_TYPE=Release
-        $ bii build
+        $ mkdir cmake && cd cmake
+        $ cmake .. -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=off
+        $ make
         
- 3. (if build failed) Biicode can have a bug sometimes where the first call to configure fails. If that happens, just call it again.
-
- 4. Install
+ 3. Install
 
         $ cd bii/build/messmer_cryfs
         $ sudo make install
-
-You can pass normal make parameters after a double dash.
-This can for example be used to add "-j5" to compile with 5 build threads in parallel:
-
-        $ bii build -- -j5
diff --git a/biicode.conf b/biicode.conf
deleted file mode 100644
index 00ef2d5c..00000000
--- a/biicode.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-# Biicode configuration file
-
-[requirements]
-	 cryptopp/cryptopp: 8
-	 google/gmock: 4
-	 google/gtest: 11
-	 messmer/blobstore: 7
-	 messmer/blockstore: 7
-	 messmer/cmake: 3
-	 messmer/cpp-utils: 9
-	 messmer/fspp: 8
-	 messmer/gitversion: 7
-	 messmer/parallelaccessstore: 6
-
-[parent]
-	messmer/cryfs: 14
-[paths]
-    # Local directories to look for headers (within block)
-    # /
-    # include
-
-[dependencies]
-    # Manual adjust file implicit dependencies, add (+), remove (-), or overwrite (=)
-    # hello.h + hello_imp.cpp hello_imp2.cpp
-    # *.h + *.cpp
-    test/main.cpp + test/*.cpp
-
-[mains]
-    # Manual adjust of files that define an executable
-    # !main.cpp  # Do not build executable from this file
-    # main2.cpp # Build it (it doesnt have a main() function, but maybe it includes it)
-
-[hooks]
-    # These are defined equal to [dependencies],files names matching bii*stage*hook.py
-    # will be launched as python scripts at stage = {post_process, clean}
-    # CMakeLists.txt + bii/my_post_process1_hook.py bii_clean_hook.py
-
-[includes]
-    # Mapping of include patterns to external blocks
-    # hello*.h: user3/depblock  # includes will be processed as user3/depblock/hello*.h
-
-[data]
-    # Manually define data files dependencies, that will be copied to bin for execution
-    # By default they are copied to bin/user/block/... which should be taken into account
-    # when loading from disk such data
-    # image.cpp + image.jpg  # code should write open("user/block/image.jpg")
-
-[tests]
-   test/*