diff --git a/openbsc/src/Makefile.am b/openbsc/src/Makefile.am
index 1a8ec64..489dc58 100644
--- a/openbsc/src/Makefile.am
+++ b/openbsc/src/Makefile.am
@@ -2,7 +2,7 @@
 AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS)
 AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(COVERAGE_LDFLAGS)
 
-SUBDIRS = common abis mgcp bsc trau osmo-nitb osmo-bsc_mgcp utils ipaccess gprs
+SUBDIRS = common abis mgcp bsc trau osmo-nitb osmo-bsc_mgcp utils ipaccess gb gprs
 
 # Conditional modules
 if BUILD_NAT
diff --git a/openbsc/src/gb/Makefile.am b/openbsc/src/gb/Makefile.am
new file mode 100644
index 0000000..b48b177
--- /dev/null
+++ b/openbsc/src/gb/Makefile.am
@@ -0,0 +1,9 @@
+INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
+AM_CFLAGS=-Wall -fno-strict-aliasing $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS)
+AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS) $(COVERAGE_LDFLAGS)
+
+noinst_LIBRARIES = libgb.a
+
+libgb_a_SOURCES = gprs_ns.c gprs_ns_frgre.c gprs_ns_vty.c \
+		  gprs_bssgp.c gprs_bssgp_util.c gprs_bssgp_vty.c
+#gprs_llc.c gprs_llc_vty.c crc24.c
diff --git a/openbsc/src/gprs/gprs_bssgp.c b/openbsc/src/gb/gprs_bssgp.c
similarity index 100%
rename from openbsc/src/gprs/gprs_bssgp.c
rename to openbsc/src/gb/gprs_bssgp.c
diff --git a/openbsc/src/gprs/gprs_bssgp_util.c b/openbsc/src/gb/gprs_bssgp_util.c
similarity index 100%
rename from openbsc/src/gprs/gprs_bssgp_util.c
rename to openbsc/src/gb/gprs_bssgp_util.c
diff --git a/openbsc/src/gprs/gprs_bssgp_vty.c b/openbsc/src/gb/gprs_bssgp_vty.c
similarity index 100%
rename from openbsc/src/gprs/gprs_bssgp_vty.c
rename to openbsc/src/gb/gprs_bssgp_vty.c
diff --git a/openbsc/src/gprs/gprs_ns.c b/openbsc/src/gb/gprs_ns.c
similarity index 100%
rename from openbsc/src/gprs/gprs_ns.c
rename to openbsc/src/gb/gprs_ns.c
diff --git a/openbsc/src/gprs/gprs_ns_frgre.c b/openbsc/src/gb/gprs_ns_frgre.c
similarity index 100%
rename from openbsc/src/gprs/gprs_ns_frgre.c
rename to openbsc/src/gb/gprs_ns_frgre.c
diff --git a/openbsc/src/gprs/gprs_ns_vty.c b/openbsc/src/gb/gprs_ns_vty.c
similarity index 100%
rename from openbsc/src/gprs/gprs_ns_vty.c
rename to openbsc/src/gb/gprs_ns_vty.c
diff --git a/openbsc/src/gprs/Makefile.am b/openbsc/src/gprs/Makefile.am
index cdad70f..e981115 100644
--- a/openbsc/src/gprs/Makefile.am
+++ b/openbsc/src/gprs/Makefile.am
@@ -2,7 +2,6 @@
 AM_CFLAGS=-Wall -fno-strict-aliasing $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS)
 AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS) $(COVERAGE_LDFLAGS)
 
-noinst_LIBRARIES = libgb.a
 noinst_HEADERS = gprs_sndcp.h
 
 if HAVE_LIBGTP
@@ -11,14 +10,10 @@
 bin_PROGRAMS = osmo-gbproxy
 endif
 
-
-libgb_a_SOURCES = gprs_ns.c gprs_ns_frgre.c gprs_ns_vty.c \
-		  gprs_bssgp.c gprs_bssgp_util.c gprs_bssgp_vty.c \
-		  gprs_llc.c gprs_llc_vty.c crc24.c
-
 osmo_gbproxy_SOURCES = gb_proxy.c gb_proxy_main.c gb_proxy_vty.c
-osmo_gbproxy_LDADD = libgb.a $(top_builddir)/src/common/libcommon.a
+osmo_gbproxy_LDADD = $(top_builddir)/src/gb/libgb.a $(top_builddir)/src/common/libcommon.a
 
 osmo_sgsn_SOURCES =	gprs_gmm.c gprs_sgsn.c gprs_sndcp.c gprs_sndcp_vty.c \
-			sgsn_main.c sgsn_vty.c sgsn_libgtp.c 
-osmo_sgsn_LDADD = libgb.a $(top_builddir)/src/common/libcommon.a -lgtp
+			sgsn_main.c sgsn_vty.c sgsn_libgtp.c \
+			gprs_llc.c gprs_llc_vty.c crc24.c
+osmo_sgsn_LDADD = $(top_builddir)/src/gb/libgb.a $(top_builddir)/src/common/libcommon.a -lgtp