diff --git a/src/vfs.c b/src/lib/vfs.c
similarity index 99%
rename from src/vfs.c
rename to src/lib/vfs.c
index 67160db..ba29782 100644
--- a/src/vfs.c
+++ b/src/lib/vfs.c
@@ -36,7 +36,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <libgen.h>
-#include "../include/Browser/vfs.h"
+#include "../../include/Browser/vfs.h"
 
 
 /* public */
diff --git a/src/plugins/project.conf b/src/plugins/project.conf
index 237788b..4b9051b 100644
--- a/src/plugins/project.conf
+++ b/src/plugins/project.conf
@@ -25,7 +25,7 @@ depends=common.c,../../include/Browser.h
 [dirtree]
 type=plugin
 sources=dirtree.c
-ldflags=-L$(OBJDIR).. -Wl,-rpath,$(LIBDIR) -lBrowser
+ldflags=-L$(OBJDIR)../lib -Wl,-rpath,$(LIBDIR) -lBrowser
 install=$(LIBDIR)/Browser/plugins
 
 [dirtree.c]
@@ -34,7 +34,7 @@ depends=../../include/Browser.h
 [favorites]
 type=plugin
 sources=favorites.c
-ldflags=-L$(OBJDIR).. -Wl,-rpath,$(LIBDIR) -lBrowser
+ldflags=-L$(OBJDIR)../lib -Wl,-rpath,$(LIBDIR) -lBrowser
 install=$(LIBDIR)/Browser/plugins
 
 [favorites.c]
diff --git a/src/project.conf b/src/project.conf
index cb8b256..6a29082 100644
--- a/src/project.conf
+++ b/src/project.conf
@@ -1,4 +1,5 @@
-targets=libBrowser,browser,copy,delete,desktop,desktopctl,move,open,properties,view
+subdirs=lib
+targets=browser,copy,delete,desktop,desktopctl,move,open,properties,view
 #cppflags=-D EMBEDDED
 cflags_force=`pkg-config --cflags libDesktop`
 cflags=-W -Wall -g -O2 -pedantic -D_FORTIFY_SOURCE=2 -fstack-protector-all
@@ -6,18 +7,12 @@ ldflags_force=`pkg-config --libs libDesktop` -lintl
 ldflags=-Wl,-z,relro -Wl,-z,now
 dist=Makefile,browser.h,callbacks.h,common.c,common.h,desktop.h,desktopicon.h,desktopiconwindow.h,window.h
 
-[libBrowser]
-type=library
-sources=vfs.c
-cflags=-fPIC
-install=$(LIBDIR)
-
 [browser]
 type=binary
-depends=$(OBJDIR)libBrowser$(SOEXT)
+depends=$(OBJDIR)lib/libBrowser.a
 sources=browser.c,callbacks.c,window.c,main.c
 cflags=-fPIE
-ldflags=-L$(OBJDIR). -Wl,-rpath,$(LIBDIR) -lBrowser -pie
+ldflags=-L$(OBJDIR)lib -Wl,-rpath,$(LIBDIR) -lBrowser -pie
 install=$(BINDIR)
 
 [browser.c]
@@ -49,10 +44,10 @@ install=$(BINDIR)
 
 [desktop]
 type=binary
-depends=$(OBJDIR)libBrowser$(SOEXT)
+depends=$(OBJDIR)lib/libBrowser.a
 sources=desktop.c,desktopicon.c,desktopiconwindow.c
 cflags=`pkg-config --cflags x11 xrandr` -fPIE
-ldflags=`pkg-config --libs x11 xrandr` -L$(OBJDIR). -Wl,-rpath,$(LIBDIR) -lBrowser -pie
+ldflags=`pkg-config --libs x11 xrandr` -L$(OBJDIR)lib -Wl,-rpath,$(LIBDIR) -lBrowser -pie
 install=$(BINDIR)
 
 [desktop.c]
@@ -92,10 +87,10 @@ install=$(BINDIR)
 
 [properties]
 type=binary
-depends=$(OBJDIR)libBrowser$(SOEXT)
+depends=$(OBJDIR)lib/libBrowser.a
 sources=properties.c
 cflags=-fPIE
-ldflags=-L$(OBJDIR). -Wl,-rpath,$(LIBDIR) -lBrowser -pie
+ldflags=-L$(OBJDIR)lib -Wl,-rpath,$(LIBDIR) -lBrowser -pie
 install=$(BINDIR)
 
 [properties.c]
@@ -104,10 +99,10 @@ cppflags=-D PREFIX=\"$(PREFIX)\"
 
 [view]
 type=binary
-depends=$(OBJDIR)libBrowser$(SOEXT)
+depends=$(OBJDIR)lib/libBrowser.a
 sources=view.c
 cflags=-fPIE
-ldflags=-L$(OBJDIR). -Wl,-rpath,$(LIBDIR) -lBrowser -pie
+ldflags=-L$(OBJDIR)lib -Wl,-rpath,$(LIBDIR) -lBrowser -pie
 install=$(BINDIR)
 
 [view.c]
diff --git a/src/widget/project.conf b/src/widget/project.conf
index 371d3a0..268929f 100644
--- a/src/widget/project.conf
+++ b/src/widget/project.conf
@@ -1,7 +1,7 @@
 targets=browser
 cflags_force=`pkg-config --cflags libDesktop` -fPIC
 cflags=-W -Wall -g -O2 -pedantic -D_FORTIFY_SOURCE=2 -fstack-protector-all
-ldflags_force=`pkg-config --libs libDesktop` -lintl -L$(OBJDIR).. -Wl,-rpath,$(LIBDIR) -lBrowser
+ldflags_force=`pkg-config --libs libDesktop` -lintl -L$(OBJDIR)../lib -Wl,-rpath,$(LIBDIR) -lBrowser
 ldflags=-Wl,-z,relro -Wl,-z,now
 dist=Makefile
 
diff --git a/tests/project.conf b/tests/project.conf
index 0795bef..b7a1f47 100644
--- a/tests/project.conf
+++ b/tests/project.conf
@@ -12,7 +12,7 @@ sources=plugins.c
 
 [vfs]
 type=binary
-ldflags=-L$(OBJDIR)../src -Wl,-rpath,../src -lBrowser
+ldflags=-L$(OBJDIR)../src/lib -Wl,-rpath,../src -lBrowser
 sources=vfs.c
 
 [tests.log]
diff --git a/tests/tests.sh b/tests/tests.sh
index 9fa2951..cf544a5 100755
--- a/tests/tests.sh
+++ b/tests/tests.sh
@@ -54,7 +54,7 @@ _run()
 	echo -n "$test:" 1>&2
 	(echo
 	echo "Testing: $OBJDIR$test" "$@"
-	LD_LIBRARY_PATH="$OBJDIR../src" "$OBJDIR$test" "$@") >> "$target" 2>&1
+	LD_LIBRARY_PATH="$OBJDIR../src/lib" "$OBJDIR$test" "$@") >> "$target" 2>&1
 	res=$?
 	if [ $res -ne 0 ]; then
 		echo " FAIL (error $res)"