diff --git a/Makefile b/Makefile
index 3f5c898..81cb9ae 100644
--- a/Makefile
+++ b/Makefile
@@ -3,39 +3,39 @@ export SUBVERSION   := 8
 export MINORVERSION := 2-SNAPSHOT
 
 all: nethogs decpcap_test test
-	$(MAKE) -f MakeApp.mk $@
-	$(MAKE) -f MakeLib.mk $@
+	$(MAKE) -C src -f MakeApp.mk $@
+	$(MAKE) -C src -f MakeLib.mk $@
 
 .PHONY:
 tgz: clean
 	cd .. ; tar czvf nethogs-$(VERSION).$(SUBVERSION).$(MINORVERSION).tar.gz --exclude-vcs nethogs/*
 
 check:
-	$(MAKE) -f MakeApp.mk $@
+	$(MAKE) -C src -f MakeApp.mk $@
 
 install:
-	$(MAKE) -f MakeApp.mk $@
-	$(MAKE) -f MakeLib.mk $@
+	$(MAKE) -C src -f MakeApp.mk $@
+	$(MAKE) -C src -f MakeLib.mk $@
 
 install_dev:
-	$(MAKE) -f MakeLib.mk $@
+	$(MAKE) -C src -f MakeLib.mk $@
 
 uninstall:
-	$(MAKE) -f MakeApp.mk $@
-	$(MAKE) -f MakeLib.mk $@
+	$(MAKE) -C src -f MakeApp.mk $@
+	$(MAKE) -C src -f MakeLib.mk $@
 
 nethogs:
-	$(MAKE) -f MakeApp.mk $@
+	$(MAKE) -C src -f MakeApp.mk $@
 
 decpcap_test:
-	$(MAKE) -f MakeApp.mk $@
+	$(MAKE) -C src -f MakeApp.mk $@
 
 test:
-	$(MAKE) -f MakeApp.mk $@
+	$(MAKE) -C src -f MakeApp.mk $@
 
 clean:
-	$(MAKE) -f MakeApp.mk $@
-	$(MAKE) -f MakeLib.mk $@
+	$(MAKE) -C src -f MakeApp.mk $@
+	$(MAKE) -C src -f MakeLib.mk $@
 
 format:
-	clang-format -i *.c *.cpp *.h
+	clang-format -i src/*.c src/*.cpp src/*.h
diff --git a/nethogs.8 b/doc/nethogs.8
similarity index 100%
rename from nethogs.8
rename to doc/nethogs.8
diff --git a/MakeApp.mk b/src/MakeApp.mk
similarity index 100%
rename from MakeApp.mk
rename to src/MakeApp.mk
diff --git a/MakeLib.mk b/src/MakeLib.mk
similarity index 100%
rename from MakeLib.mk
rename to src/MakeLib.mk
diff --git a/connection.cpp b/src/connection.cpp
similarity index 100%
rename from connection.cpp
rename to src/connection.cpp
diff --git a/connection.h b/src/connection.h
similarity index 100%
rename from connection.h
rename to src/connection.h
diff --git a/conninode.cpp b/src/conninode.cpp
similarity index 100%
rename from conninode.cpp
rename to src/conninode.cpp
diff --git a/conninode.h b/src/conninode.h
similarity index 100%
rename from conninode.h
rename to src/conninode.h
diff --git a/conninode_test.cpp b/src/conninode_test.cpp
similarity index 100%
rename from conninode_test.cpp
rename to src/conninode_test.cpp
diff --git a/cui.cpp b/src/cui.cpp
similarity index 100%
rename from cui.cpp
rename to src/cui.cpp
diff --git a/cui.h b/src/cui.h
similarity index 100%
rename from cui.h
rename to src/cui.h
diff --git a/decpcap.c b/src/decpcap.c
similarity index 100%
rename from decpcap.c
rename to src/decpcap.c
diff --git a/decpcap.h b/src/decpcap.h
similarity index 100%
rename from decpcap.h
rename to src/decpcap.h
diff --git a/decpcap_test.cpp b/src/decpcap_test.cpp
similarity index 100%
rename from decpcap_test.cpp
rename to src/decpcap_test.cpp
diff --git a/devices.cpp b/src/devices.cpp
similarity index 100%
rename from devices.cpp
rename to src/devices.cpp
diff --git a/devices.h b/src/devices.h
similarity index 100%
rename from devices.h
rename to src/devices.h
diff --git a/inode2prog.cpp b/src/inode2prog.cpp
similarity index 100%
rename from inode2prog.cpp
rename to src/inode2prog.cpp
diff --git a/inode2prog.h b/src/inode2prog.h
similarity index 100%
rename from inode2prog.h
rename to src/inode2prog.h
diff --git a/libnethogs.cpp b/src/libnethogs.cpp
similarity index 100%
rename from libnethogs.cpp
rename to src/libnethogs.cpp
diff --git a/libnethogs.h b/src/libnethogs.h
similarity index 100%
rename from libnethogs.h
rename to src/libnethogs.h
diff --git a/main.cpp b/src/main.cpp
similarity index 100%
rename from main.cpp
rename to src/main.cpp
diff --git a/nethogs.cpp b/src/nethogs.cpp
similarity index 100%
rename from nethogs.cpp
rename to src/nethogs.cpp
diff --git a/nethogs.h b/src/nethogs.h
similarity index 100%
rename from nethogs.h
rename to src/nethogs.h
diff --git a/packet.cpp b/src/packet.cpp
similarity index 100%
rename from packet.cpp
rename to src/packet.cpp
diff --git a/packet.h b/src/packet.h
similarity index 100%
rename from packet.h
rename to src/packet.h
diff --git a/process.cpp b/src/process.cpp
similarity index 100%
rename from process.cpp
rename to src/process.cpp
diff --git a/process.h b/src/process.h
similarity index 100%
rename from process.h
rename to src/process.h
diff --git a/testfiles/proc_net_tcp b/src/testfiles/proc_net_tcp
similarity index 100%
rename from testfiles/proc_net_tcp
rename to src/testfiles/proc_net_tcp
diff --git a/testfiles/proc_net_tcp_big b/src/testfiles/proc_net_tcp_big
similarity index 100%
rename from testfiles/proc_net_tcp_big
rename to src/testfiles/proc_net_tcp_big