diff --git a/src/Jamfile b/src/Jamfile
index 4f3285f28..ab3e0e5ca 100644
--- a/src/Jamfile
+++ b/src/Jamfile
@@ -1,10 +1,11 @@
 SubDir TOP ;
 
-SubInclude TOP src ;
+if $(BUILDTYPE) = UNITY {
 SubInclude TOP eressea ;
+}
 
 if $(BUILDTYPE) = REGULAR {
-SubInclude TOP common ;
+SubInclude TOP src ;
 SubInclude TOP eressea ;
 SubInclude TOP tools ;
-}
+}
\ No newline at end of file
diff --git a/src/eressea/Jamfile b/src/eressea/Jamfile
index c66702469..a7416f710 100644
--- a/src/eressea/Jamfile
+++ b/src/eressea/Jamfile
@@ -1,7 +1,7 @@
 SubDir TOP eressea ;
 
 TargetDirectory ;
-SubDirHdrs $(SUBDIR)/../src/gamecode ;
+SubDirHdrs $(SUBDIR)/../src/build ;
 SubDirHdrs $(SUBDIR)/../src/kernel ;
 SubDirHdrs $(SUBDIR)/../src/util ;
 SubDirHdrs $(SUBDIR)/../src ;
@@ -9,83 +9,30 @@ SubDirHdrs $(SUBDIR)/../external ;
 SubDirHdrs $(SUBDIR)/.. ;
 
 UsingLua ;
-UsingLuabind ;
 
-SEARCH_SOURCE += [ FDirName $(TOP) src iniparser ] ;
-SEARCH_SOURCE += [ FDirName $(SUBDIR) curses ] ;
-if $(BINDINGS) = LUABIND {
-   SEARCH_SOURCE += [ FDirName $(SUBDIR) lua ] ;
-}
-if $(BINDINGS) = TOLUA {
-   SEARCH_SOURCE += [ FDirName $(SUBDIR) tolua ] ;
-}
+SEARCH_SOURCE += [ FDirName $(TOP) src build ] ;
+SEARCH_SOURCE += [ FDirName $(SUBDIR) src ] ;
 SubDirC++Flags -DHAVE_LUA ;
 
 SubDirHdrs $(XMLHDRS) ;
 
-LUASERVER = eressea-lua ;
+SERVER = eressea ;
 
-SERVER_SOURCES = main.c korrektur.c ;
-
-TOLUA_SOURCES = 
- <tolua>bindings.c
- <tolua>helpers.c
- <tolua>bind_sqlite.c
- <tolua>bind_unit.c
- <tolua>bind_ship.c
- <tolua>bind_storage.c
- <tolua>bind_faction.c
- <tolua>bind_region.c
- <tolua>bind_message.c
- <tolua>bind_hashtable.c
- <tolua>bind_building.c
- <tolua>bind_gmtool.c
-;
-
-LUABIND_SOURCES =
- <lua>alliance.cpp
- <lua>building.cpp
- <lua>eressea.cpp
- <lua>event.cpp
- <lua>faction.cpp
- <lua>message.cpp
- <lua>objects.cpp
- <lua>region.cpp
- <lua>ship.cpp
- <lua>spell.cpp
- <lua>unit.cpp
- <lua>item.cpp
- <lua>test.cpp
- <lua>gm.cpp
- <lua>script.cpp
- <lua>gamecode.cpp
-;
-
-if $(BINDINGS) = LUABIND {
-  Library bindings : $(LUABIND_SOURCES) ;
-  libluabind $(LUASERVER) ;
-}
-if $(BINDINGS) = TOLUA {
-  Library bindings : $(TOLUA_SOURCES) ;
-  libtolua $(LUASERVER) ;
-}
-liblua $(LUASERVER) ;
-
-LUASERVER_SOURCES =
- <src!iniparser>iniparser.c
- <curses>listbox.c
- server.c
- console.c
- editing.c
- gmtool.c
+SERVER_SOURCES = 
+ <build!external.c>
+ <build!gamecode.c>
+ <build!kernel.c>
+ <build!lib.c>
+ <build!util.c>
+ <src!server.c>
  ;
 
-# eressea-server with lua scripting
-LinkLibraries $(LUASERVER) :
- bindings gamecode items spells kernel modules attributes races triggers util ;
-libxml2 $(LUASERVER) ;
-libcurses $(LUASERVER) ;
-libmcheck $(LUASERVER) ;
+libtolua $(SERVER) ;
+liblua $(SERVER) ;
 
-LINKLIBS on $(LUASERVER) += -lm -ldl -lstdc++ ;
-Main $(LUASERVER) : $(LUASERVER_SOURCES) ;
+# eressea-server with lua scripting
+libxml2 $(SERVER) ;
+libcurses $(SERVER) ;
+
+LINKLIBS on $(SERVER) += -lm -ldl -lstdc++ ;
+Main $(SERVER) : $(SERVER_SOURCES) ;
diff --git a/src/eressea/src/races/Jamfile b/src/eressea/src/races/Jamfile
index 99eeff83e..6272f8708 100644
--- a/src/eressea/src/races/Jamfile
+++ b/src/eressea/src/races/Jamfile
@@ -1,4 +1,4 @@
-SubDir TOP common races ;
+SubDir TOP src races ;
 
 TargetDirectory ;
 SubDirHdrs $(SUBDIR)/../gamecode ;
diff --git a/src/eressea/src/spells/Jamfile b/src/eressea/src/spells/Jamfile
index 88bdcce62..a0aaaf7d4 100644
--- a/src/eressea/src/spells/Jamfile
+++ b/src/eressea/src/spells/Jamfile
@@ -1,4 +1,4 @@
-SubDir TOP common spells ;
+SubDir TOP src spells ;
 
 TargetDirectory ;
 SubDirHdrs $(SUBDIR)/../gamecode ;
diff --git a/src/src/Jamfile b/src/src/Jamfile
index 126744821..566c39d4e 100644
--- a/src/src/Jamfile
+++ b/src/src/Jamfile
@@ -1,11 +1,16 @@
-SubDir TOP common ;
+SubDir TOP src ;
 
-SubInclude TOP common kernel ;
-SubInclude TOP common gamecode ;
-SubInclude TOP common spells ;
-SubInclude TOP common races ;
-SubInclude TOP common triggers ;
-SubInclude TOP common util ;
-SubInclude TOP common attributes ;
-SubInclude TOP common modules ;
-SubInclude TOP common items ;
+if $(BUILDTYPE) = REGULAR {
+SubInclude TOP src kernel ;
+SubInclude TOP src gamecode ;
+SubInclude TOP src spells ;
+SubInclude TOP src races ;
+SubInclude TOP src triggers ;
+SubInclude TOP src util ;
+SubInclude TOP src attributes ;
+SubInclude TOP src modules ;
+SubInclude TOP src items ;
+} else {
+# UNITY build
+SubInclude TOP src build ;
+}
diff --git a/src/src/attributes/Jamfile b/src/src/attributes/Jamfile
index 49b14e019..4d191013b 100644
--- a/src/src/attributes/Jamfile
+++ b/src/src/attributes/Jamfile
@@ -1,4 +1,4 @@
-SubDir TOP common attributes ;
+SubDir TOP src attributes ;
 
 TargetDirectory ;
 SubDirHdrs $(SUBDIR)/../gamecode ;
diff --git a/src/src/build/Copy of curses.c b/src/src/build/Copy of curses.c
deleted file mode 100644
index 24a6fec70..000000000
--- a/src/src/build/Copy of curses.c	
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "common/settings.h"
-#include <platform.h>
-#include "stdafx.h"
-
-#include <util/listbox.c>
-#include <gmtool.c>
-#include <eressea.c>
diff --git a/src/src/build/Jamfile b/src/src/build/Jamfile
index 1263d230b..0afff22c8 100644
--- a/src/src/build/Jamfile
+++ b/src/src/build/Jamfile
@@ -1,18 +1,18 @@
-SubDir TOP combined ;
+SubDir TOP src build ;
 
 TargetDirectory ;
-SubDirHdrs $(SUBDIR)/../eressea ;
-SubDirHdrs $(SUBDIR)/../common/gamecode ;
-SubDirHdrs $(SUBDIR)/../common/kernel ;
-SubDirHdrs $(SUBDIR)/../common/util ;
-SubDirHdrs $(SUBDIR)/../common ;
-SubDirHdrs $(SUBDIR)/../tools ;
-SubDirHdrs $(SUBDIR)/../external ;
+SubDirHdrs $(SUBDIR)/../../eressea ;
+SubDirHdrs $(SUBDIR)/../../src/gamecode ;
+SubDirHdrs $(SUBDIR)/../../src/kernel ;
+SubDirHdrs $(SUBDIR)/../../src/util ;
+SubDirHdrs $(SUBDIR)/../../src ;
+SubDirHdrs $(SUBDIR)/../../tools ;
+SubDirHdrs $(SUBDIR)/../../external ;
 SubDirHdrs $(SUBDIR)/.. ;
 
 UsingLua ;
 
-SEARCH_SOURCE += [ FDirName $(TOP) common iniparser ] ;
+SEARCH_SOURCE += [ FDirName $(TOP) src iniparser ] ;
 SEARCH_SOURCE += [ FDirName $(SUBDIR) curses ] ;
 if $(BINDINGS) = LUABIND {
    SEARCH_SOURCE += [ FDirName $(SUBDIR) lua ] ;
diff --git a/src/src/gamecode/Jamfile b/src/src/gamecode/Jamfile
index c7f8380cc..8b96dd4e7 100644
--- a/src/src/gamecode/Jamfile
+++ b/src/src/gamecode/Jamfile
@@ -1,4 +1,4 @@
-SubDir TOP common gamecode ;
+SubDir TOP src gamecode ;
 
 TargetDirectory ;
 SubDirHdrs $(SUBDIR)/../kernel ;
diff --git a/src/src/items/Jamfile b/src/src/items/Jamfile
index 3bb138392..854501024 100644
--- a/src/src/items/Jamfile
+++ b/src/src/items/Jamfile
@@ -1,4 +1,4 @@
-SubDir TOP common items ;
+SubDir TOP src items ;
 
 TargetDirectory ;
 SubDirHdrs $(SUBDIR)/../gamecode ;
diff --git a/src/src/kernel/Jamfile b/src/src/kernel/Jamfile
index 5616c2492..e03b858ef 100644
--- a/src/src/kernel/Jamfile
+++ b/src/src/kernel/Jamfile
@@ -1,4 +1,4 @@
-SubDir TOP common kernel ;
+SubDir TOP src kernel ;
 
 TargetDirectory ;
 SubDirHdrs $(SUBDIR)/../util ;
diff --git a/src/src/modules/Jamfile b/src/src/modules/Jamfile
index 27ea4e108..a346a77a1 100644
--- a/src/src/modules/Jamfile
+++ b/src/src/modules/Jamfile
@@ -1,4 +1,4 @@
-SubDir TOP common modules ;
+SubDir TOP src modules ;
 
 TargetDirectory ;
 SubDirHdrs $(SUBDIR)/../gamecode ;
diff --git a/src/src/triggers/Jamfile b/src/src/triggers/Jamfile
index 9dd4f0811..cacf7a025 100644
--- a/src/src/triggers/Jamfile
+++ b/src/src/triggers/Jamfile
@@ -1,4 +1,4 @@
-SubDir TOP common triggers ;
+SubDir TOP src triggers ;
 
 TargetDirectory ;
 SubDirHdrs $(SUBDIR)/../gamecode ;
diff --git a/src/src/util/Jamfile b/src/src/util/Jamfile
index a3f4cccf1..997d4f958 100644
--- a/src/src/util/Jamfile
+++ b/src/src/util/Jamfile
@@ -1,4 +1,4 @@
-SubDir TOP common util ;
+SubDir TOP src util ;
 
 TargetDirectory ;
 SubDirHdrs $(SUBDIR)/.. ;
diff --git a/src/tools/Jamfile b/src/tools/Jamfile
index 833725a9e..ee22fd427 100644
--- a/src/tools/Jamfile
+++ b/src/tools/Jamfile
@@ -1,10 +1,10 @@
 SubDir TOP tools ;
 
 TargetDirectory ;
-SubDirHdrs $(SUBDIR)/../common/gamecode ;
-SubDirHdrs $(SUBDIR)/../common/kernel ;
-SubDirHdrs $(SUBDIR)/../common/util ;
-SubDirHdrs $(SUBDIR)/../common ;
+SubDirHdrs $(SUBDIR)/../src/gamecode ;
+SubDirHdrs $(SUBDIR)/../src/kernel ;
+SubDirHdrs $(SUBDIR)/../src/util ;
+SubDirHdrs $(SUBDIR)/../src ;
 SubDirHdrs $(SUBDIR)/.. ;
 
 SubDirHdrs $(XMLHDRS) ;