diff --git a/.travis.yml b/.travis.yml
index f945759..681884b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,7 @@ matrix:
    - compiler: i586-mingw32msvc-gcc
 
 script:
- - make
+ - cd src && make
 
 # Only watch the master
 branches:
diff --git a/Android.mk b/Android.mk
index bf1e936..ed0fefb 100644
--- a/Android.mk
+++ b/Android.mk
@@ -2,7 +2,7 @@
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
-LOCAL_SRC_FILES:= bbootimg.c libbootimg.c
+LOCAL_SRC_FILES:= src/bbootimg.c src/libbootimg.c
 LOCAL_MODULE:= bbootimg
 LOCAL_MODULE_TAGS := eng
 
@@ -16,7 +16,7 @@ include $(BUILD_EXECUTABLE)
 
 # libbootimg
 include $(CLEAR_VARS)
-LOCAL_SRC_FILES := libbootimg.c
+LOCAL_SRC_FILES := src/libbootimg.c
 LOCAL_MODULE := libbootimg
 LOCAL_MODULE_TAGS := eng
 include $(BUILD_STATIC_LIBRARY)
diff --git a/README.md b/README.md
index 6ceb343..be2096b 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,10 @@
 # libbootimg
 [![Build Status](https://travis-ci.org/Tasssadar/libbootimg.png?branch=master)](https://travis-ci.org/Tasssadar/libbootimg)
 
-libbootimg is small library which can create, extract or update Android boot images. 
+libbootimg is small library which can create, extract or update Android boot images.
 
-## bbootimg
-This is cli frontend for libbootimg, compatible with abootimg's arguments.
+**This library is required to build MultiROM and its modified TWRP. Clone it to
+`/system/extras/libbootimg` inside the Android source tree.**
+
+### bbootimg
+`bbootimg` is a cli frontend for libbootimg, compatible with abootimg's arguments.
diff --git a/boot_img_hdr.h b/include/boot_img_hdr.h
similarity index 100%
rename from boot_img_hdr.h
rename to include/boot_img_hdr.h
diff --git a/libbootimg.h b/include/libbootimg.h
similarity index 100%
rename from libbootimg.h
rename to include/libbootimg.h
diff --git a/Makefile b/src/Makefile
similarity index 100%
rename from Makefile
rename to src/Makefile
diff --git a/bbootimg.c b/src/bbootimg.c
similarity index 99%
rename from bbootimg.c
rename to src/bbootimg.c
index bb02a71..b5c959c 100644
--- a/bbootimg.c
+++ b/src/bbootimg.c
@@ -3,7 +3,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "libbootimg.h"
+#include "../include/libbootimg.h"
 
 #define ACT_HELP    0
 #define ACT_EXTRACT 1
diff --git a/libbootimg.c b/src/libbootimg.c
similarity index 99%
rename from libbootimg.c
rename to src/libbootimg.c
index bcf9aa5..7554731 100644
--- a/libbootimg.c
+++ b/src/libbootimg.c
@@ -8,7 +8,7 @@
 #include <limits.h>
 #include <ctype.h>
 
-#include "libbootimg.h"
+#include "../include/libbootimg.h"
 #include "version.h"
 
 #define DEFAULT_PAGE_SIZE 2048
diff --git a/version.h b/src/version.h
similarity index 100%
rename from version.h
rename to src/version.h