diff --git a/app/app.pro b/app/app.pro
new file mode 100644
index 0000000..7c44813
--- /dev/null
+++ b/app/app.pro
@@ -0,0 +1,21 @@
+# -------------------------------------------------
+# Project created by QtCreator 2012-01-04T21:23:34
+# -------------------------------------------------
+QT -= core \
+    gui
+
+TARGET = ../bin/mbica
+
+TEMPLATE = app 
+CONFIG += console
+
+SOURCES += \
+    main.cpp \
+
+LIBS += -lmbica -larmadillo
+
+INCLUDEPATH += ../include
+QMAKE_LIBDIR += ../lib
+
+DEFINES += ARMA_USE_LAPACK \
+    BOOST_PARAMETER_MAX_ARITY=7
diff --git a/main.cpp b/app/main.cpp
similarity index 100%
rename from main.cpp
rename to app/main.cpp
diff --git a/icaseparator.h b/include/icaseparator.h
similarity index 100%
rename from icaseparator.h
rename to include/icaseparator.h
diff --git a/mbica.h b/include/mbica.h
similarity index 100%
rename from mbica.h
rename to include/mbica.h
diff --git a/nonlinearities.h b/include/nonlinearities.h
similarity index 100%
rename from nonlinearities.h
rename to include/nonlinearities.h
diff --git a/policies.h b/include/policies.h
similarity index 100%
rename from policies.h
rename to include/policies.h
diff --git a/utils.h b/include/utils.h
similarity index 100%
rename from utils.h
rename to include/utils.h
diff --git a/mbica.pro b/mbica.pro
index 892074d..0cc87b6 100644
--- a/mbica.pro
+++ b/mbica.pro
@@ -1,26 +1,10 @@
-# -------------------------------------------------
-# Project created by QtCreator 2012-01-04T21:23:34
-# -------------------------------------------------
-QT -= core \
-    gui
-TARGET = mbica
 
-# TEMPLATE = lib
-# CONFIG += staticlib
-SOURCES += \
-    icaseparator.cpp \
-    nonlinearities.cpp \
-    main.cpp \
-    utils.cpp \
-    policies.cpp
-    #tests/pca_test.cpp \
-    #tests/whitening_test.cpp
-HEADERS += mbica.h \
-    icaseparator.h \
-    nonlinearities.h \
-    utils.h \
-    policies.h
-LIBS += -larmadillo -lboost_unit_test_framework
+TEMPLATE = subdirs
+SUBDIRS = library \
+		app \
+                tests
+
+library.subdir = source
+app.depends = library
+tests.depends = library
 
-DEFINES += ARMA_USE_LAPACK \
-    BOOST_PARAMETER_MAX_ARITY=7
diff --git a/icaseparator.cpp b/source/icaseparator.cpp
similarity index 100%
rename from icaseparator.cpp
rename to source/icaseparator.cpp
diff --git a/nonlinearities.cpp b/source/nonlinearities.cpp
similarity index 100%
rename from nonlinearities.cpp
rename to source/nonlinearities.cpp
diff --git a/policies.cpp b/source/policies.cpp
similarity index 100%
rename from policies.cpp
rename to source/policies.cpp
diff --git a/source/source.pro b/source/source.pro
new file mode 100644
index 0000000..c060871
--- /dev/null
+++ b/source/source.pro
@@ -0,0 +1,27 @@
+# -------------------------------------------------
+# Project created by QtCreator 2012-01-04T21:23:34
+# -------------------------------------------------
+QT -= core \
+    gui
+
+TARGET = ../lib/mbica
+
+TEMPLATE = lib
+CONFIG += staticlib
+
+SOURCES += \
+    icaseparator.cpp \
+    nonlinearities.cpp \
+    utils.cpp \
+    policies.cpp
+HEADERS += ../include/mbica.h \
+    ../include/icaseparator.h \
+    ../include/nonlinearities.h \
+    ../include/utils.h \
+    ../include/policies.h
+
+INCLUDEPATH += ../include
+LIBS += -larmadillo -lboost_unit_test_framework
+
+DEFINES += ARMA_USE_LAPACK \
+    BOOST_PARAMETER_MAX_ARITY=7
diff --git a/utils.cpp b/source/utils.cpp
similarity index 100%
rename from utils.cpp
rename to source/utils.cpp
diff --git a/tests/tests.pro b/tests/tests.pro
new file mode 100644
index 0000000..4b6539d
--- /dev/null
+++ b/tests/tests.pro
@@ -0,0 +1,22 @@
+# -------------------------------------------------
+# Project created by QtCreator 2012-01-04T21:23:34
+# -------------------------------------------------
+QT -= core \
+    gui
+
+TARGET = unit_tests
+
+TEMPLATE = app
+CONFIG += console
+
+SOURCES += \
+    pca_test.cpp \
+    whitening_test.cpp
+
+LIBS += -lmbica -larmadillo -lboost_unit_test_framework
+
+INCLUDEPATH += ../include
+QMAKE_LIBDIR += ../lib
+
+DEFINES += ARMA_USE_LAPACK \
+    BOOST_PARAMETER_MAX_ARITY=7
diff --git a/epoc_reader/SConstruct b/tools/epoc_reader/SConstruct
similarity index 100%
rename from epoc_reader/SConstruct
rename to tools/epoc_reader/SConstruct
diff --git a/epoc_reader/main.cpp b/tools/epoc_reader/main.cpp
similarity index 100%
rename from epoc_reader/main.cpp
rename to tools/epoc_reader/main.cpp
diff --git a/filtering_tool/SConstruct b/tools/filtering_tool/SConstruct
similarity index 100%
rename from filtering_tool/SConstruct
rename to tools/filtering_tool/SConstruct
diff --git a/filtering_tool/main.cpp b/tools/filtering_tool/main.cpp
similarity index 100%
rename from filtering_tool/main.cpp
rename to tools/filtering_tool/main.cpp