diff --git a/openbsc/AUTHORS b/AUTHORS
similarity index 100%
rename from openbsc/AUTHORS
rename to AUTHORS
diff --git a/openbsc/COPYING b/COPYING
similarity index 100%
rename from openbsc/COPYING
rename to COPYING
diff --git a/openbsc/Makefile.am b/Makefile.am
similarity index 100%
rename from openbsc/Makefile.am
rename to Makefile.am
diff --git a/openbsc/README b/README
similarity index 100%
rename from openbsc/README
rename to README
diff --git a/openbsc/README.vty-tests b/README.vty-tests
similarity index 100%
rename from openbsc/README.vty-tests
rename to README.vty-tests
diff --git a/openbsc/configure.ac b/configure.ac
similarity index 100%
rename from openbsc/configure.ac
rename to configure.ac
diff --git a/openbsc/contrib/a-link/sccp-split-by-con.lua b/contrib/a-link/sccp-split-by-con.lua
similarity index 100%
rename from openbsc/contrib/a-link/sccp-split-by-con.lua
rename to contrib/a-link/sccp-split-by-con.lua
diff --git a/openbsc/contrib/bsc-test/README b/contrib/bsc-test/README
similarity index 100%
rename from openbsc/contrib/bsc-test/README
rename to contrib/bsc-test/README
diff --git a/openbsc/contrib/bsc-test/all_dial b/contrib/bsc-test/all_dial
similarity index 100%
rename from openbsc/contrib/bsc-test/all_dial
rename to contrib/bsc-test/all_dial
diff --git a/openbsc/contrib/bsc-test/dial.sh b/contrib/bsc-test/dial.sh
similarity index 100%
rename from openbsc/contrib/bsc-test/dial.sh
rename to contrib/bsc-test/dial.sh
diff --git a/openbsc/contrib/bsc-test/drop-oml.sh b/contrib/bsc-test/drop-oml.sh
similarity index 100%
rename from openbsc/contrib/bsc-test/drop-oml.sh
rename to contrib/bsc-test/drop-oml.sh
diff --git a/openbsc/contrib/bsc-test/drop.sh b/contrib/bsc-test/drop.sh
similarity index 100%
rename from openbsc/contrib/bsc-test/drop.sh
rename to contrib/bsc-test/drop.sh
diff --git a/openbsc/contrib/bsc-test/hangup b/contrib/bsc-test/hangup
similarity index 100%
rename from openbsc/contrib/bsc-test/hangup
rename to contrib/bsc-test/hangup
diff --git a/openbsc/contrib/bsc-test/msc.sh b/contrib/bsc-test/msc.sh
similarity index 100%
rename from openbsc/contrib/bsc-test/msc.sh
rename to contrib/bsc-test/msc.sh
diff --git a/openbsc/contrib/bsc_control.py b/contrib/bsc_control.py
similarity index 100%
rename from openbsc/contrib/bsc_control.py
rename to contrib/bsc_control.py
diff --git a/openbsc/contrib/bt.py b/contrib/bt.py
similarity index 100%
rename from openbsc/contrib/bt.py
rename to contrib/bt.py
diff --git a/openbsc/contrib/convert_to_enum.py b/contrib/convert_to_enum.py
similarity index 100%
rename from openbsc/contrib/convert_to_enum.py
rename to contrib/convert_to_enum.py
diff --git a/openbsc/contrib/ctrl2sse.py b/contrib/ctrl2sse.py
similarity index 100%
rename from openbsc/contrib/ctrl2sse.py
rename to contrib/ctrl2sse.py
diff --git a/openbsc/contrib/gprs/gb-proxy-unblock-bug.py b/contrib/gprs/gb-proxy-unblock-bug.py
similarity index 100%
rename from openbsc/contrib/gprs/gb-proxy-unblock-bug.py
rename to contrib/gprs/gb-proxy-unblock-bug.py
diff --git a/openbsc/contrib/gprs/gprs-bssgp-histogram.lua b/contrib/gprs/gprs-bssgp-histogram.lua
similarity index 100%
rename from openbsc/contrib/gprs/gprs-bssgp-histogram.lua
rename to contrib/gprs/gprs-bssgp-histogram.lua
diff --git a/openbsc/contrib/gprs/gprs-buffer-count.lua b/contrib/gprs/gprs-buffer-count.lua
similarity index 100%
rename from openbsc/contrib/gprs/gprs-buffer-count.lua
rename to contrib/gprs/gprs-buffer-count.lua
diff --git a/openbsc/contrib/gprs/gprs-split-trace-by-tlli.lua b/contrib/gprs/gprs-split-trace-by-tlli.lua
similarity index 100%
rename from openbsc/contrib/gprs/gprs-split-trace-by-tlli.lua
rename to contrib/gprs/gprs-split-trace-by-tlli.lua
diff --git a/openbsc/contrib/gprs/gprs-verify-nu.lua b/contrib/gprs/gprs-verify-nu.lua
similarity index 100%
rename from openbsc/contrib/gprs/gprs-verify-nu.lua
rename to contrib/gprs/gprs-verify-nu.lua
diff --git a/openbsc/contrib/hlr-remove-old.sql b/contrib/hlr-remove-old.sql
similarity index 100%
rename from openbsc/contrib/hlr-remove-old.sql
rename to contrib/hlr-remove-old.sql
diff --git a/openbsc/contrib/hlrsync/hlrsync.py b/contrib/hlrsync/hlrsync.py
similarity index 100%
rename from openbsc/contrib/hlrsync/hlrsync.py
rename to contrib/hlrsync/hlrsync.py
diff --git a/openbsc/contrib/ipa.py b/contrib/ipa.py
similarity index 100%
rename from openbsc/contrib/ipa.py
rename to contrib/ipa.py
diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index 068ee34..b315b97 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -43,7 +43,6 @@
 set -x
 
 cd "$base"
-cd openbsc
 autoreconf --install --force
 ./configure --enable-osmo-bsc --enable-nat $SMPP $MGCP $IU --enable-vty-tests --enable-external-tests
 $MAKE $PARALLEL_MAKE
diff --git a/openbsc/contrib/mgcp_server.py b/contrib/mgcp_server.py
similarity index 100%
rename from openbsc/contrib/mgcp_server.py
rename to contrib/mgcp_server.py
diff --git a/openbsc/contrib/nat/test_regexp.c b/contrib/nat/test_regexp.c
similarity index 100%
rename from openbsc/contrib/nat/test_regexp.c
rename to contrib/nat/test_regexp.c
diff --git a/openbsc/contrib/nat/ussd_example.py b/contrib/nat/ussd_example.py
similarity index 100%
rename from openbsc/contrib/nat/ussd_example.py
rename to contrib/nat/ussd_example.py
diff --git a/openbsc/contrib/rtp/gen_rtp_header.erl b/contrib/rtp/gen_rtp_header.erl
similarity index 100%
rename from openbsc/contrib/rtp/gen_rtp_header.erl
rename to contrib/rtp/gen_rtp_header.erl
diff --git a/openbsc/contrib/rtp/rtp_replay.st b/contrib/rtp/rtp_replay.st
similarity index 100%
rename from openbsc/contrib/rtp/rtp_replay.st
rename to contrib/rtp/rtp_replay.st
diff --git a/openbsc/contrib/rtp/rtp_replay_shared.st b/contrib/rtp/rtp_replay_shared.st
similarity index 100%
rename from openbsc/contrib/rtp/rtp_replay_shared.st
rename to contrib/rtp/rtp_replay_shared.st
diff --git a/openbsc/contrib/rtp/rtp_replay_sip.st b/contrib/rtp/rtp_replay_sip.st
similarity index 100%
rename from openbsc/contrib/rtp/rtp_replay_sip.st
rename to contrib/rtp/rtp_replay_sip.st
diff --git a/openbsc/contrib/rtp/timestamp_rtp.lua b/contrib/rtp/timestamp_rtp.lua
similarity index 100%
rename from openbsc/contrib/rtp/timestamp_rtp.lua
rename to contrib/rtp/timestamp_rtp.lua
diff --git a/openbsc/contrib/sms/fill-hlr.st b/contrib/sms/fill-hlr.st
similarity index 100%
rename from openbsc/contrib/sms/fill-hlr.st
rename to contrib/sms/fill-hlr.st
diff --git a/openbsc/contrib/sms/hlr-query.st b/contrib/sms/hlr-query.st
similarity index 100%
rename from openbsc/contrib/sms/hlr-query.st
rename to contrib/sms/hlr-query.st
diff --git a/openbsc/contrib/sms/sqlite-probe.tap.d b/contrib/sms/sqlite-probe.tap.d
similarity index 100%
rename from openbsc/contrib/sms/sqlite-probe.tap.d
rename to contrib/sms/sqlite-probe.tap.d
diff --git a/openbsc/contrib/soap.py b/contrib/soap.py
similarity index 100%
rename from openbsc/contrib/soap.py
rename to contrib/soap.py
diff --git a/openbsc/contrib/systemd/osmo-bsc-mgcp.service b/contrib/systemd/osmo-bsc-mgcp.service
similarity index 100%
rename from openbsc/contrib/systemd/osmo-bsc-mgcp.service
rename to contrib/systemd/osmo-bsc-mgcp.service
diff --git a/openbsc/contrib/systemd/osmo-bsc.service b/contrib/systemd/osmo-bsc.service
similarity index 100%
rename from openbsc/contrib/systemd/osmo-bsc.service
rename to contrib/systemd/osmo-bsc.service
diff --git a/openbsc/contrib/systemd/osmo-gbproxy.service b/contrib/systemd/osmo-gbproxy.service
similarity index 100%
rename from openbsc/contrib/systemd/osmo-gbproxy.service
rename to contrib/systemd/osmo-gbproxy.service
diff --git a/openbsc/contrib/systemd/osmo-nitb.service b/contrib/systemd/osmo-nitb.service
similarity index 100%
rename from openbsc/contrib/systemd/osmo-nitb.service
rename to contrib/systemd/osmo-nitb.service
diff --git a/openbsc/contrib/systemd/osmo-sgsn.service b/contrib/systemd/osmo-sgsn.service
similarity index 100%
rename from openbsc/contrib/systemd/osmo-sgsn.service
rename to contrib/systemd/osmo-sgsn.service
diff --git a/openbsc/contrib/testconv/Makefile b/contrib/testconv/Makefile
similarity index 100%
rename from openbsc/contrib/testconv/Makefile
rename to contrib/testconv/Makefile
diff --git a/openbsc/contrib/testconv/testconv_main.c b/contrib/testconv/testconv_main.c
similarity index 100%
rename from openbsc/contrib/testconv/testconv_main.c
rename to contrib/testconv/testconv_main.c
diff --git a/openbsc/contrib/twisted_ipa.py b/contrib/twisted_ipa.py
similarity index 100%
rename from openbsc/contrib/twisted_ipa.py
rename to contrib/twisted_ipa.py
diff --git a/openbsc/doc/BS11-OML.txt b/doc/BS11-OML.txt
similarity index 100%
rename from openbsc/doc/BS11-OML.txt
rename to doc/BS11-OML.txt
diff --git a/openbsc/doc/Makefile.am b/doc/Makefile.am
similarity index 100%
rename from openbsc/doc/Makefile.am
rename to doc/Makefile.am
diff --git a/openbsc/doc/call-routing.txt b/doc/call-routing.txt
similarity index 100%
rename from openbsc/doc/call-routing.txt
rename to doc/call-routing.txt
diff --git a/openbsc/doc/channel_release.txt b/doc/channel_release.txt
similarity index 100%
rename from openbsc/doc/channel_release.txt
rename to doc/channel_release.txt
diff --git a/openbsc/doc/e1-data-model.txt b/doc/e1-data-model.txt
similarity index 100%
rename from openbsc/doc/e1-data-model.txt
rename to doc/e1-data-model.txt
diff --git a/openbsc/doc/examples/Makefile.am b/doc/examples/Makefile.am
similarity index 100%
rename from openbsc/doc/examples/Makefile.am
rename to doc/examples/Makefile.am
diff --git a/openbsc/doc/examples/osmo-bsc/osmo-bsc.cfg b/doc/examples/osmo-bsc/osmo-bsc.cfg
similarity index 100%
rename from openbsc/doc/examples/osmo-bsc/osmo-bsc.cfg
rename to doc/examples/osmo-bsc/osmo-bsc.cfg
diff --git a/openbsc/doc/examples/osmo-bsc_mgcp/mgcp.cfg b/doc/examples/osmo-bsc_mgcp/mgcp.cfg
similarity index 100%
rename from openbsc/doc/examples/osmo-bsc_mgcp/mgcp.cfg
rename to doc/examples/osmo-bsc_mgcp/mgcp.cfg
diff --git a/openbsc/doc/examples/osmo-bsc_nat/black-list.cfg b/doc/examples/osmo-bsc_nat/black-list.cfg
similarity index 100%
rename from openbsc/doc/examples/osmo-bsc_nat/black-list.cfg
rename to doc/examples/osmo-bsc_nat/black-list.cfg
diff --git a/openbsc/doc/examples/osmo-bsc_nat/bscs.config b/doc/examples/osmo-bsc_nat/bscs.config
similarity index 100%
rename from openbsc/doc/examples/osmo-bsc_nat/bscs.config
rename to doc/examples/osmo-bsc_nat/bscs.config
diff --git a/openbsc/doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg b/doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg
similarity index 100%
rename from openbsc/doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg
rename to doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg
diff --git a/openbsc/doc/examples/osmo-gbproxy/osmo-gbproxy-legacy.cfg b/doc/examples/osmo-gbproxy/osmo-gbproxy-legacy.cfg
similarity index 100%
rename from openbsc/doc/examples/osmo-gbproxy/osmo-gbproxy-legacy.cfg
rename to doc/examples/osmo-gbproxy/osmo-gbproxy-legacy.cfg
diff --git a/openbsc/doc/examples/osmo-gbproxy/osmo-gbproxy.cfg b/doc/examples/osmo-gbproxy/osmo-gbproxy.cfg
similarity index 100%
rename from openbsc/doc/examples/osmo-gbproxy/osmo-gbproxy.cfg
rename to doc/examples/osmo-gbproxy/osmo-gbproxy.cfg
diff --git a/openbsc/doc/examples/osmo-gtphub/gtphub-example.txt b/doc/examples/osmo-gtphub/gtphub-example.txt
similarity index 100%
rename from openbsc/doc/examples/osmo-gtphub/gtphub-example.txt
rename to doc/examples/osmo-gtphub/gtphub-example.txt
diff --git a/openbsc/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg b/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg
similarity index 100%
rename from openbsc/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg
rename to doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg
diff --git a/openbsc/doc/examples/osmo-gtphub/osmo-gtphub.cfg b/doc/examples/osmo-gtphub/osmo-gtphub.cfg
similarity index 100%
rename from openbsc/doc/examples/osmo-gtphub/osmo-gtphub.cfg
rename to doc/examples/osmo-gtphub/osmo-gtphub.cfg
diff --git a/openbsc/doc/examples/osmo-nitb/bs11/openbsc-1bts-2trx-hopping.cfg b/doc/examples/osmo-nitb/bs11/openbsc-1bts-2trx-hopping.cfg
similarity index 100%
rename from openbsc/doc/examples/osmo-nitb/bs11/openbsc-1bts-2trx-hopping.cfg
rename to doc/examples/osmo-nitb/bs11/openbsc-1bts-2trx-hopping.cfg
diff --git a/openbsc/doc/examples/osmo-nitb/bs11/openbsc-1bts-2trx.cfg b/doc/examples/osmo-nitb/bs11/openbsc-1bts-2trx.cfg
similarity index 100%
rename from openbsc/doc/examples/osmo-nitb/bs11/openbsc-1bts-2trx.cfg
rename to doc/examples/osmo-nitb/bs11/openbsc-1bts-2trx.cfg
diff --git a/openbsc/doc/examples/osmo-nitb/bs11/openbsc-2bts-2trx.cfg b/doc/examples/osmo-nitb/bs11/openbsc-2bts-2trx.cfg
similarity index 100%
rename from openbsc/doc/examples/osmo-nitb/bs11/openbsc-2bts-2trx.cfg
rename to doc/examples/osmo-nitb/bs11/openbsc-2bts-2trx.cfg
diff --git a/openbsc/doc/examples/osmo-nitb/bs11/openbsc.cfg b/doc/examples/osmo-nitb/bs11/openbsc.cfg
similarity index 100%
rename from openbsc/doc/examples/osmo-nitb/bs11/openbsc.cfg
rename to doc/examples/osmo-nitb/bs11/openbsc.cfg
diff --git a/openbsc/doc/examples/osmo-nitb/nanobts/openbsc-multitrx.cfg b/doc/examples/osmo-nitb/nanobts/openbsc-multitrx.cfg
similarity index 100%
rename from openbsc/doc/examples/osmo-nitb/nanobts/openbsc-multitrx.cfg
rename to doc/examples/osmo-nitb/nanobts/openbsc-multitrx.cfg
diff --git a/openbsc/doc/examples/osmo-nitb/nanobts/openbsc.cfg b/doc/examples/osmo-nitb/nanobts/openbsc.cfg
similarity index 100%
rename from openbsc/doc/examples/osmo-nitb/nanobts/openbsc.cfg
rename to doc/examples/osmo-nitb/nanobts/openbsc.cfg
diff --git a/openbsc/doc/examples/osmo-nitb/nokia/openbsc_nokia_3trx.cfg b/doc/examples/osmo-nitb/nokia/openbsc_nokia_3trx.cfg
similarity index 100%
rename from openbsc/doc/examples/osmo-nitb/nokia/openbsc_nokia_3trx.cfg
rename to doc/examples/osmo-nitb/nokia/openbsc_nokia_3trx.cfg
diff --git a/openbsc/doc/examples/osmo-nitb/rbs2308/openbsc.cfg b/doc/examples/osmo-nitb/rbs2308/openbsc.cfg
similarity index 100%
rename from openbsc/doc/examples/osmo-nitb/rbs2308/openbsc.cfg
rename to doc/examples/osmo-nitb/rbs2308/openbsc.cfg
diff --git a/openbsc/doc/examples/osmo-nitb/sysmobts/openbsc.cfg b/doc/examples/osmo-nitb/sysmobts/openbsc.cfg
similarity index 100%
rename from openbsc/doc/examples/osmo-nitb/sysmobts/openbsc.cfg
rename to doc/examples/osmo-nitb/sysmobts/openbsc.cfg
diff --git a/openbsc/doc/examples/osmo-sgsn/osmo-sgsn.cfg b/doc/examples/osmo-sgsn/osmo-sgsn.cfg
similarity index 100%
rename from openbsc/doc/examples/osmo-sgsn/osmo-sgsn.cfg
rename to doc/examples/osmo-sgsn/osmo-sgsn.cfg
diff --git a/openbsc/doc/gsm-hopping.txt b/doc/gsm-hopping.txt
similarity index 100%
rename from openbsc/doc/gsm-hopping.txt
rename to doc/gsm-hopping.txt
diff --git a/openbsc/doc/handover.txt b/doc/handover.txt
similarity index 100%
rename from openbsc/doc/handover.txt
rename to doc/handover.txt
diff --git a/openbsc/doc/ipa-sccp.txt b/doc/ipa-sccp.txt
similarity index 100%
rename from openbsc/doc/ipa-sccp.txt
rename to doc/ipa-sccp.txt
diff --git a/openbsc/doc/oml-interface.txt b/doc/oml-interface.txt
similarity index 100%
rename from openbsc/doc/oml-interface.txt
rename to doc/oml-interface.txt
diff --git a/openbsc/doc/osmo-nitb-data_structures.dot b/doc/osmo-nitb-data_structures.dot
similarity index 100%
rename from openbsc/doc/osmo-nitb-data_structures.dot
rename to doc/osmo-nitb-data_structures.dot
diff --git a/openbsc/doc/paging.txt b/doc/paging.txt
similarity index 100%
rename from openbsc/doc/paging.txt
rename to doc/paging.txt
diff --git a/openbsc/git-version-gen b/git-version-gen
similarity index 100%
rename from openbsc/git-version-gen
rename to git-version-gen
diff --git a/openbsc/include/Makefile.am b/include/Makefile.am
similarity index 100%
rename from openbsc/include/Makefile.am
rename to include/Makefile.am
diff --git a/openbsc/include/compat_af_isdn.h b/include/compat_af_isdn.h
similarity index 100%
rename from openbsc/include/compat_af_isdn.h
rename to include/compat_af_isdn.h
diff --git a/openbsc/include/mISDNif.h b/include/mISDNif.h
similarity index 100%
rename from openbsc/include/mISDNif.h
rename to include/mISDNif.h
diff --git a/openbsc/include/openbsc/Makefile.am b/include/openbsc/Makefile.am
similarity index 100%
rename from openbsc/include/openbsc/Makefile.am
rename to include/openbsc/Makefile.am
diff --git a/openbsc/include/openbsc/abis_nm.h b/include/openbsc/abis_nm.h
similarity index 100%
rename from openbsc/include/openbsc/abis_nm.h
rename to include/openbsc/abis_nm.h
diff --git a/openbsc/include/openbsc/abis_om2000.h b/include/openbsc/abis_om2000.h
similarity index 100%
rename from openbsc/include/openbsc/abis_om2000.h
rename to include/openbsc/abis_om2000.h
diff --git a/openbsc/include/openbsc/abis_rsl.h b/include/openbsc/abis_rsl.h
similarity index 100%
rename from openbsc/include/openbsc/abis_rsl.h
rename to include/openbsc/abis_rsl.h
diff --git a/openbsc/include/openbsc/arfcn_range_encode.h b/include/openbsc/arfcn_range_encode.h
similarity index 100%
rename from openbsc/include/openbsc/arfcn_range_encode.h
rename to include/openbsc/arfcn_range_encode.h
diff --git a/openbsc/include/openbsc/auth.h b/include/openbsc/auth.h
similarity index 100%
rename from openbsc/include/openbsc/auth.h
rename to include/openbsc/auth.h
diff --git a/openbsc/include/openbsc/bsc_api.h b/include/openbsc/bsc_api.h
similarity index 100%
rename from openbsc/include/openbsc/bsc_api.h
rename to include/openbsc/bsc_api.h
diff --git a/openbsc/include/openbsc/bsc_msc.h b/include/openbsc/bsc_msc.h
similarity index 100%
rename from openbsc/include/openbsc/bsc_msc.h
rename to include/openbsc/bsc_msc.h
diff --git a/openbsc/include/openbsc/bsc_msc_data.h b/include/openbsc/bsc_msc_data.h
similarity index 100%
rename from openbsc/include/openbsc/bsc_msc_data.h
rename to include/openbsc/bsc_msc_data.h
diff --git a/openbsc/include/openbsc/bsc_msg_filter.h b/include/openbsc/bsc_msg_filter.h
similarity index 100%
rename from openbsc/include/openbsc/bsc_msg_filter.h
rename to include/openbsc/bsc_msg_filter.h
diff --git a/openbsc/include/openbsc/bsc_nat.h b/include/openbsc/bsc_nat.h
similarity index 100%
rename from openbsc/include/openbsc/bsc_nat.h
rename to include/openbsc/bsc_nat.h
diff --git a/openbsc/include/openbsc/bsc_nat_callstats.h b/include/openbsc/bsc_nat_callstats.h
similarity index 100%
rename from openbsc/include/openbsc/bsc_nat_callstats.h
rename to include/openbsc/bsc_nat_callstats.h
diff --git a/openbsc/include/openbsc/bsc_nat_sccp.h b/include/openbsc/bsc_nat_sccp.h
similarity index 100%
rename from openbsc/include/openbsc/bsc_nat_sccp.h
rename to include/openbsc/bsc_nat_sccp.h
diff --git a/openbsc/include/openbsc/bsc_rll.h b/include/openbsc/bsc_rll.h
similarity index 100%
rename from openbsc/include/openbsc/bsc_rll.h
rename to include/openbsc/bsc_rll.h
diff --git a/openbsc/include/openbsc/bsc_subscriber.h b/include/openbsc/bsc_subscriber.h
similarity index 100%
rename from openbsc/include/openbsc/bsc_subscriber.h
rename to include/openbsc/bsc_subscriber.h
diff --git a/openbsc/include/openbsc/bss.h b/include/openbsc/bss.h
similarity index 100%
rename from openbsc/include/openbsc/bss.h
rename to include/openbsc/bss.h
diff --git a/openbsc/include/openbsc/bts_ipaccess_nanobts_omlattr.h b/include/openbsc/bts_ipaccess_nanobts_omlattr.h
similarity index 100%
rename from openbsc/include/openbsc/bts_ipaccess_nanobts_omlattr.h
rename to include/openbsc/bts_ipaccess_nanobts_omlattr.h
diff --git a/openbsc/include/openbsc/chan_alloc.h b/include/openbsc/chan_alloc.h
similarity index 100%
rename from openbsc/include/openbsc/chan_alloc.h
rename to include/openbsc/chan_alloc.h
diff --git a/openbsc/include/openbsc/common_bsc.h b/include/openbsc/common_bsc.h
similarity index 100%
rename from openbsc/include/openbsc/common_bsc.h
rename to include/openbsc/common_bsc.h
diff --git a/openbsc/include/openbsc/common_cs.h b/include/openbsc/common_cs.h
similarity index 100%
rename from openbsc/include/openbsc/common_cs.h
rename to include/openbsc/common_cs.h
diff --git a/openbsc/include/openbsc/crc24.h b/include/openbsc/crc24.h
similarity index 100%
rename from openbsc/include/openbsc/crc24.h
rename to include/openbsc/crc24.h
diff --git a/openbsc/include/openbsc/ctrl.h b/include/openbsc/ctrl.h
similarity index 100%
rename from openbsc/include/openbsc/ctrl.h
rename to include/openbsc/ctrl.h
diff --git a/openbsc/include/openbsc/db.h b/include/openbsc/db.h
similarity index 100%
rename from openbsc/include/openbsc/db.h
rename to include/openbsc/db.h
diff --git a/openbsc/include/openbsc/debug.h b/include/openbsc/debug.h
similarity index 100%
rename from openbsc/include/openbsc/debug.h
rename to include/openbsc/debug.h
diff --git a/openbsc/include/openbsc/e1_config.h b/include/openbsc/e1_config.h
similarity index 100%
rename from openbsc/include/openbsc/e1_config.h
rename to include/openbsc/e1_config.h
diff --git a/openbsc/include/openbsc/gb_proxy.h b/include/openbsc/gb_proxy.h
similarity index 100%
rename from openbsc/include/openbsc/gb_proxy.h
rename to include/openbsc/gb_proxy.h
diff --git a/openbsc/include/openbsc/gprs_gb_parse.h b/include/openbsc/gprs_gb_parse.h
similarity index 100%
rename from openbsc/include/openbsc/gprs_gb_parse.h
rename to include/openbsc/gprs_gb_parse.h
diff --git a/openbsc/include/openbsc/gprs_gmm.h b/include/openbsc/gprs_gmm.h
similarity index 100%
rename from openbsc/include/openbsc/gprs_gmm.h
rename to include/openbsc/gprs_gmm.h
diff --git a/openbsc/include/openbsc/gprs_llc.h b/include/openbsc/gprs_llc.h
similarity index 100%
rename from openbsc/include/openbsc/gprs_llc.h
rename to include/openbsc/gprs_llc.h
diff --git a/openbsc/include/openbsc/gprs_llc_xid.h b/include/openbsc/gprs_llc_xid.h
similarity index 100%
rename from openbsc/include/openbsc/gprs_llc_xid.h
rename to include/openbsc/gprs_llc_xid.h
diff --git a/openbsc/include/openbsc/gprs_sgsn.h b/include/openbsc/gprs_sgsn.h
similarity index 100%
rename from openbsc/include/openbsc/gprs_sgsn.h
rename to include/openbsc/gprs_sgsn.h
diff --git a/openbsc/include/openbsc/gprs_sndcp.h b/include/openbsc/gprs_sndcp.h
similarity index 100%
rename from openbsc/include/openbsc/gprs_sndcp.h
rename to include/openbsc/gprs_sndcp.h
diff --git a/openbsc/include/openbsc/gprs_sndcp_comp.h b/include/openbsc/gprs_sndcp_comp.h
similarity index 100%
rename from openbsc/include/openbsc/gprs_sndcp_comp.h
rename to include/openbsc/gprs_sndcp_comp.h
diff --git a/openbsc/include/openbsc/gprs_sndcp_dcomp.h b/include/openbsc/gprs_sndcp_dcomp.h
similarity index 100%
rename from openbsc/include/openbsc/gprs_sndcp_dcomp.h
rename to include/openbsc/gprs_sndcp_dcomp.h
diff --git a/openbsc/include/openbsc/gprs_sndcp_pcomp.h b/include/openbsc/gprs_sndcp_pcomp.h
similarity index 100%
rename from openbsc/include/openbsc/gprs_sndcp_pcomp.h
rename to include/openbsc/gprs_sndcp_pcomp.h
diff --git a/openbsc/include/openbsc/gprs_sndcp_xid.h b/include/openbsc/gprs_sndcp_xid.h
similarity index 100%
rename from openbsc/include/openbsc/gprs_sndcp_xid.h
rename to include/openbsc/gprs_sndcp_xid.h
diff --git a/openbsc/include/openbsc/gprs_subscriber.h b/include/openbsc/gprs_subscriber.h
similarity index 100%
rename from openbsc/include/openbsc/gprs_subscriber.h
rename to include/openbsc/gprs_subscriber.h
diff --git a/openbsc/include/openbsc/gprs_utils.h b/include/openbsc/gprs_utils.h
similarity index 100%
rename from openbsc/include/openbsc/gprs_utils.h
rename to include/openbsc/gprs_utils.h
diff --git a/openbsc/include/openbsc/gsm_04_08.h b/include/openbsc/gsm_04_08.h
similarity index 100%
rename from openbsc/include/openbsc/gsm_04_08.h
rename to include/openbsc/gsm_04_08.h
diff --git a/openbsc/include/openbsc/gsm_04_11.h b/include/openbsc/gsm_04_11.h
similarity index 100%
rename from openbsc/include/openbsc/gsm_04_11.h
rename to include/openbsc/gsm_04_11.h
diff --git a/openbsc/include/openbsc/gsm_04_80.h b/include/openbsc/gsm_04_80.h
similarity index 100%
rename from openbsc/include/openbsc/gsm_04_80.h
rename to include/openbsc/gsm_04_80.h
diff --git a/openbsc/include/openbsc/gsm_data.h b/include/openbsc/gsm_data.h
similarity index 100%
rename from openbsc/include/openbsc/gsm_data.h
rename to include/openbsc/gsm_data.h
diff --git a/openbsc/include/openbsc/gsm_data_shared.h b/include/openbsc/gsm_data_shared.h
similarity index 100%
rename from openbsc/include/openbsc/gsm_data_shared.h
rename to include/openbsc/gsm_data_shared.h
diff --git a/openbsc/include/openbsc/gsm_subscriber.h b/include/openbsc/gsm_subscriber.h
similarity index 100%
rename from openbsc/include/openbsc/gsm_subscriber.h
rename to include/openbsc/gsm_subscriber.h
diff --git a/openbsc/include/openbsc/gsup_client.h b/include/openbsc/gsup_client.h
similarity index 100%
rename from openbsc/include/openbsc/gsup_client.h
rename to include/openbsc/gsup_client.h
diff --git a/openbsc/include/openbsc/gtphub.h b/include/openbsc/gtphub.h
similarity index 100%
rename from openbsc/include/openbsc/gtphub.h
rename to include/openbsc/gtphub.h
diff --git a/openbsc/include/openbsc/handover.h b/include/openbsc/handover.h
similarity index 100%
rename from openbsc/include/openbsc/handover.h
rename to include/openbsc/handover.h
diff --git a/openbsc/include/openbsc/handover_decision.h b/include/openbsc/handover_decision.h
similarity index 100%
rename from openbsc/include/openbsc/handover_decision.h
rename to include/openbsc/handover_decision.h
diff --git a/openbsc/include/openbsc/ipaccess.h b/include/openbsc/ipaccess.h
similarity index 100%
rename from openbsc/include/openbsc/ipaccess.h
rename to include/openbsc/ipaccess.h
diff --git a/openbsc/include/openbsc/iu.h b/include/openbsc/iu.h
similarity index 100%
rename from openbsc/include/openbsc/iu.h
rename to include/openbsc/iu.h
diff --git a/openbsc/include/openbsc/meas_feed.h b/include/openbsc/meas_feed.h
similarity index 100%
rename from openbsc/include/openbsc/meas_feed.h
rename to include/openbsc/meas_feed.h
diff --git a/openbsc/include/openbsc/meas_rep.h b/include/openbsc/meas_rep.h
similarity index 100%
rename from openbsc/include/openbsc/meas_rep.h
rename to include/openbsc/meas_rep.h
diff --git a/openbsc/include/openbsc/mgcp.h b/include/openbsc/mgcp.h
similarity index 100%
rename from openbsc/include/openbsc/mgcp.h
rename to include/openbsc/mgcp.h
diff --git a/openbsc/include/openbsc/mgcp_internal.h b/include/openbsc/mgcp_internal.h
similarity index 100%
rename from openbsc/include/openbsc/mgcp_internal.h
rename to include/openbsc/mgcp_internal.h
diff --git a/openbsc/include/openbsc/mgcp_transcode.h b/include/openbsc/mgcp_transcode.h
similarity index 100%
rename from openbsc/include/openbsc/mgcp_transcode.h
rename to include/openbsc/mgcp_transcode.h
diff --git a/openbsc/include/openbsc/misdn.h b/include/openbsc/misdn.h
similarity index 100%
rename from openbsc/include/openbsc/misdn.h
rename to include/openbsc/misdn.h
diff --git a/openbsc/include/openbsc/mncc.h b/include/openbsc/mncc.h
similarity index 100%
rename from openbsc/include/openbsc/mncc.h
rename to include/openbsc/mncc.h
diff --git a/openbsc/include/openbsc/mncc_int.h b/include/openbsc/mncc_int.h
similarity index 100%
rename from openbsc/include/openbsc/mncc_int.h
rename to include/openbsc/mncc_int.h
diff --git a/openbsc/include/openbsc/nat_rewrite_trie.h b/include/openbsc/nat_rewrite_trie.h
similarity index 100%
rename from openbsc/include/openbsc/nat_rewrite_trie.h
rename to include/openbsc/nat_rewrite_trie.h
diff --git a/openbsc/include/openbsc/network_listen.h b/include/openbsc/network_listen.h
similarity index 100%
rename from openbsc/include/openbsc/network_listen.h
rename to include/openbsc/network_listen.h
diff --git a/openbsc/include/openbsc/oap_client.h b/include/openbsc/oap_client.h
similarity index 100%
rename from openbsc/include/openbsc/oap_client.h
rename to include/openbsc/oap_client.h
diff --git a/openbsc/include/openbsc/openbscdefines.h b/include/openbsc/openbscdefines.h
similarity index 100%
rename from openbsc/include/openbsc/openbscdefines.h
rename to include/openbsc/openbscdefines.h
diff --git a/openbsc/include/openbsc/osmo_bsc.h b/include/openbsc/osmo_bsc.h
similarity index 100%
rename from openbsc/include/openbsc/osmo_bsc.h
rename to include/openbsc/osmo_bsc.h
diff --git a/openbsc/include/openbsc/osmo_bsc_grace.h b/include/openbsc/osmo_bsc_grace.h
similarity index 100%
rename from openbsc/include/openbsc/osmo_bsc_grace.h
rename to include/openbsc/osmo_bsc_grace.h
diff --git a/openbsc/include/openbsc/osmo_bsc_rf.h b/include/openbsc/osmo_bsc_rf.h
similarity index 100%
rename from openbsc/include/openbsc/osmo_bsc_rf.h
rename to include/openbsc/osmo_bsc_rf.h
diff --git a/openbsc/include/openbsc/osmo_msc.h b/include/openbsc/osmo_msc.h
similarity index 100%
rename from openbsc/include/openbsc/osmo_msc.h
rename to include/openbsc/osmo_msc.h
diff --git a/openbsc/include/openbsc/osmux.h b/include/openbsc/osmux.h
similarity index 100%
rename from openbsc/include/openbsc/osmux.h
rename to include/openbsc/osmux.h
diff --git a/openbsc/include/openbsc/paging.h b/include/openbsc/paging.h
similarity index 100%
rename from openbsc/include/openbsc/paging.h
rename to include/openbsc/paging.h
diff --git a/openbsc/include/openbsc/pcu_if.h b/include/openbsc/pcu_if.h
similarity index 100%
rename from openbsc/include/openbsc/pcu_if.h
rename to include/openbsc/pcu_if.h
diff --git a/openbsc/include/openbsc/pcuif_proto.h b/include/openbsc/pcuif_proto.h
similarity index 100%
rename from openbsc/include/openbsc/pcuif_proto.h
rename to include/openbsc/pcuif_proto.h
diff --git a/openbsc/include/openbsc/rest_octets.h b/include/openbsc/rest_octets.h
similarity index 100%
rename from openbsc/include/openbsc/rest_octets.h
rename to include/openbsc/rest_octets.h
diff --git a/openbsc/include/openbsc/rrlp.h b/include/openbsc/rrlp.h
similarity index 100%
rename from openbsc/include/openbsc/rrlp.h
rename to include/openbsc/rrlp.h
diff --git a/openbsc/include/openbsc/rs232.h b/include/openbsc/rs232.h
similarity index 100%
rename from openbsc/include/openbsc/rs232.h
rename to include/openbsc/rs232.h
diff --git a/openbsc/include/openbsc/rtp_proxy.h b/include/openbsc/rtp_proxy.h
similarity index 100%
rename from openbsc/include/openbsc/rtp_proxy.h
rename to include/openbsc/rtp_proxy.h
diff --git a/openbsc/include/openbsc/sgsn.h b/include/openbsc/sgsn.h
similarity index 100%
rename from openbsc/include/openbsc/sgsn.h
rename to include/openbsc/sgsn.h
diff --git a/openbsc/include/openbsc/signal.h b/include/openbsc/signal.h
similarity index 100%
rename from openbsc/include/openbsc/signal.h
rename to include/openbsc/signal.h
diff --git a/openbsc/include/openbsc/silent_call.h b/include/openbsc/silent_call.h
similarity index 100%
rename from openbsc/include/openbsc/silent_call.h
rename to include/openbsc/silent_call.h
diff --git a/openbsc/include/openbsc/slhc.h b/include/openbsc/slhc.h
similarity index 100%
rename from openbsc/include/openbsc/slhc.h
rename to include/openbsc/slhc.h
diff --git a/openbsc/include/openbsc/smpp.h b/include/openbsc/smpp.h
similarity index 100%
rename from openbsc/include/openbsc/smpp.h
rename to include/openbsc/smpp.h
diff --git a/openbsc/include/openbsc/sms_queue.h b/include/openbsc/sms_queue.h
similarity index 100%
rename from openbsc/include/openbsc/sms_queue.h
rename to include/openbsc/sms_queue.h
diff --git a/openbsc/include/openbsc/socket.h b/include/openbsc/socket.h
similarity index 100%
rename from openbsc/include/openbsc/socket.h
rename to include/openbsc/socket.h
diff --git a/openbsc/include/openbsc/system_information.h b/include/openbsc/system_information.h
similarity index 100%
rename from openbsc/include/openbsc/system_information.h
rename to include/openbsc/system_information.h
diff --git a/openbsc/include/openbsc/token_auth.h b/include/openbsc/token_auth.h
similarity index 100%
rename from openbsc/include/openbsc/token_auth.h
rename to include/openbsc/token_auth.h
diff --git a/openbsc/include/openbsc/transaction.h b/include/openbsc/transaction.h
similarity index 100%
rename from openbsc/include/openbsc/transaction.h
rename to include/openbsc/transaction.h
diff --git a/openbsc/include/openbsc/trau_mux.h b/include/openbsc/trau_mux.h
similarity index 100%
rename from openbsc/include/openbsc/trau_mux.h
rename to include/openbsc/trau_mux.h
diff --git a/openbsc/include/openbsc/trau_upqueue.h b/include/openbsc/trau_upqueue.h
similarity index 100%
rename from openbsc/include/openbsc/trau_upqueue.h
rename to include/openbsc/trau_upqueue.h
diff --git a/openbsc/include/openbsc/ussd.h b/include/openbsc/ussd.h
similarity index 100%
rename from openbsc/include/openbsc/ussd.h
rename to include/openbsc/ussd.h
diff --git a/openbsc/include/openbsc/v42bis.h b/include/openbsc/v42bis.h
similarity index 100%
rename from openbsc/include/openbsc/v42bis.h
rename to include/openbsc/v42bis.h
diff --git a/openbsc/include/openbsc/v42bis_private.h b/include/openbsc/v42bis_private.h
similarity index 100%
rename from openbsc/include/openbsc/v42bis_private.h
rename to include/openbsc/v42bis_private.h
diff --git a/openbsc/include/openbsc/vty.h b/include/openbsc/vty.h
similarity index 100%
rename from openbsc/include/openbsc/vty.h
rename to include/openbsc/vty.h
diff --git a/openbsc/m4/README b/m4/README
similarity index 100%
rename from openbsc/m4/README
rename to m4/README
diff --git a/openbsc/m4/ax_check_compile_flag.m4 b/m4/ax_check_compile_flag.m4
similarity index 100%
rename from openbsc/m4/ax_check_compile_flag.m4
rename to m4/ax_check_compile_flag.m4
diff --git a/openbsc/openbsc.pc.in b/openbsc.pc.in
similarity index 100%
rename from openbsc/openbsc.pc.in
rename to openbsc.pc.in
diff --git a/openbsc/osmoappdesc.py b/osmoappdesc.py
similarity index 100%
rename from openbsc/osmoappdesc.py
rename to osmoappdesc.py
diff --git a/openbsc/src/Makefile.am b/src/Makefile.am
similarity index 100%
rename from openbsc/src/Makefile.am
rename to src/Makefile.am
diff --git a/openbsc/src/gprs/.gitignore b/src/gprs/.gitignore
similarity index 100%
rename from openbsc/src/gprs/.gitignore
rename to src/gprs/.gitignore
diff --git a/openbsc/src/gprs/Makefile.am b/src/gprs/Makefile.am
similarity index 100%
rename from openbsc/src/gprs/Makefile.am
rename to src/gprs/Makefile.am
diff --git a/openbsc/src/gprs/crc24.c b/src/gprs/crc24.c
similarity index 100%
rename from openbsc/src/gprs/crc24.c
rename to src/gprs/crc24.c
diff --git a/openbsc/src/gprs/gb_proxy.c b/src/gprs/gb_proxy.c
similarity index 100%
rename from openbsc/src/gprs/gb_proxy.c
rename to src/gprs/gb_proxy.c
diff --git a/openbsc/src/gprs/gb_proxy_main.c b/src/gprs/gb_proxy_main.c
similarity index 100%
rename from openbsc/src/gprs/gb_proxy_main.c
rename to src/gprs/gb_proxy_main.c
diff --git a/openbsc/src/gprs/gb_proxy_patch.c b/src/gprs/gb_proxy_patch.c
similarity index 100%
rename from openbsc/src/gprs/gb_proxy_patch.c
rename to src/gprs/gb_proxy_patch.c
diff --git a/openbsc/src/gprs/gb_proxy_peer.c b/src/gprs/gb_proxy_peer.c
similarity index 100%
rename from openbsc/src/gprs/gb_proxy_peer.c
rename to src/gprs/gb_proxy_peer.c
diff --git a/openbsc/src/gprs/gb_proxy_tlli.c b/src/gprs/gb_proxy_tlli.c
similarity index 100%
rename from openbsc/src/gprs/gb_proxy_tlli.c
rename to src/gprs/gb_proxy_tlli.c
diff --git a/openbsc/src/gprs/gb_proxy_vty.c b/src/gprs/gb_proxy_vty.c
similarity index 100%
rename from openbsc/src/gprs/gb_proxy_vty.c
rename to src/gprs/gb_proxy_vty.c
diff --git a/openbsc/src/gprs/gprs_gb_parse.c b/src/gprs/gprs_gb_parse.c
similarity index 100%
rename from openbsc/src/gprs/gprs_gb_parse.c
rename to src/gprs/gprs_gb_parse.c
diff --git a/openbsc/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c
similarity index 100%
rename from openbsc/src/gprs/gprs_gmm.c
rename to src/gprs/gprs_gmm.c
diff --git a/openbsc/src/gprs/gprs_llc.c b/src/gprs/gprs_llc.c
similarity index 100%
rename from openbsc/src/gprs/gprs_llc.c
rename to src/gprs/gprs_llc.c
diff --git a/openbsc/src/gprs/gprs_llc_parse.c b/src/gprs/gprs_llc_parse.c
similarity index 100%
rename from openbsc/src/gprs/gprs_llc_parse.c
rename to src/gprs/gprs_llc_parse.c
diff --git a/openbsc/src/gprs/gprs_llc_vty.c b/src/gprs/gprs_llc_vty.c
similarity index 100%
rename from openbsc/src/gprs/gprs_llc_vty.c
rename to src/gprs/gprs_llc_vty.c
diff --git a/openbsc/src/gprs/gprs_llc_xid.c b/src/gprs/gprs_llc_xid.c
similarity index 100%
rename from openbsc/src/gprs/gprs_llc_xid.c
rename to src/gprs/gprs_llc_xid.c
diff --git a/openbsc/src/gprs/gprs_sgsn.c b/src/gprs/gprs_sgsn.c
similarity index 100%
rename from openbsc/src/gprs/gprs_sgsn.c
rename to src/gprs/gprs_sgsn.c
diff --git a/openbsc/src/gprs/gprs_sndcp.c b/src/gprs/gprs_sndcp.c
similarity index 100%
rename from openbsc/src/gprs/gprs_sndcp.c
rename to src/gprs/gprs_sndcp.c
diff --git a/openbsc/src/gprs/gprs_sndcp_comp.c b/src/gprs/gprs_sndcp_comp.c
similarity index 100%
rename from openbsc/src/gprs/gprs_sndcp_comp.c
rename to src/gprs/gprs_sndcp_comp.c
diff --git a/openbsc/src/gprs/gprs_sndcp_dcomp.c b/src/gprs/gprs_sndcp_dcomp.c
similarity index 100%
rename from openbsc/src/gprs/gprs_sndcp_dcomp.c
rename to src/gprs/gprs_sndcp_dcomp.c
diff --git a/openbsc/src/gprs/gprs_sndcp_pcomp.c b/src/gprs/gprs_sndcp_pcomp.c
similarity index 100%
rename from openbsc/src/gprs/gprs_sndcp_pcomp.c
rename to src/gprs/gprs_sndcp_pcomp.c
diff --git a/openbsc/src/gprs/gprs_sndcp_vty.c b/src/gprs/gprs_sndcp_vty.c
similarity index 100%
rename from openbsc/src/gprs/gprs_sndcp_vty.c
rename to src/gprs/gprs_sndcp_vty.c
diff --git a/openbsc/src/gprs/gprs_sndcp_xid.c b/src/gprs/gprs_sndcp_xid.c
similarity index 100%
rename from openbsc/src/gprs/gprs_sndcp_xid.c
rename to src/gprs/gprs_sndcp_xid.c
diff --git a/openbsc/src/gprs/gprs_subscriber.c b/src/gprs/gprs_subscriber.c
similarity index 100%
rename from openbsc/src/gprs/gprs_subscriber.c
rename to src/gprs/gprs_subscriber.c
diff --git a/openbsc/src/gprs/gprs_utils.c b/src/gprs/gprs_utils.c
similarity index 100%
rename from openbsc/src/gprs/gprs_utils.c
rename to src/gprs/gprs_utils.c
diff --git a/openbsc/src/gprs/gtphub.c b/src/gprs/gtphub.c
similarity index 100%
rename from openbsc/src/gprs/gtphub.c
rename to src/gprs/gtphub.c
diff --git a/openbsc/src/gprs/gtphub_ares.c b/src/gprs/gtphub_ares.c
similarity index 100%
rename from openbsc/src/gprs/gtphub_ares.c
rename to src/gprs/gtphub_ares.c
diff --git a/openbsc/src/gprs/gtphub_main.c b/src/gprs/gtphub_main.c
similarity index 100%
rename from openbsc/src/gprs/gtphub_main.c
rename to src/gprs/gtphub_main.c
diff --git a/openbsc/src/gprs/gtphub_sock.c b/src/gprs/gtphub_sock.c
similarity index 100%
rename from openbsc/src/gprs/gtphub_sock.c
rename to src/gprs/gtphub_sock.c
diff --git a/openbsc/src/gprs/gtphub_vty.c b/src/gprs/gtphub_vty.c
similarity index 100%
rename from openbsc/src/gprs/gtphub_vty.c
rename to src/gprs/gtphub_vty.c
diff --git a/openbsc/src/gprs/osmo_sgsn.cfg b/src/gprs/osmo_sgsn.cfg
similarity index 100%
rename from openbsc/src/gprs/osmo_sgsn.cfg
rename to src/gprs/osmo_sgsn.cfg
diff --git a/openbsc/src/gprs/sgsn_ares.c b/src/gprs/sgsn_ares.c
similarity index 100%
rename from openbsc/src/gprs/sgsn_ares.c
rename to src/gprs/sgsn_ares.c
diff --git a/openbsc/src/gprs/sgsn_auth.c b/src/gprs/sgsn_auth.c
similarity index 100%
rename from openbsc/src/gprs/sgsn_auth.c
rename to src/gprs/sgsn_auth.c
diff --git a/openbsc/src/gprs/sgsn_cdr.c b/src/gprs/sgsn_cdr.c
similarity index 100%
rename from openbsc/src/gprs/sgsn_cdr.c
rename to src/gprs/sgsn_cdr.c
diff --git a/openbsc/src/gprs/sgsn_ctrl.c b/src/gprs/sgsn_ctrl.c
similarity index 100%
rename from openbsc/src/gprs/sgsn_ctrl.c
rename to src/gprs/sgsn_ctrl.c
diff --git a/openbsc/src/gprs/sgsn_libgtp.c b/src/gprs/sgsn_libgtp.c
similarity index 100%
rename from openbsc/src/gprs/sgsn_libgtp.c
rename to src/gprs/sgsn_libgtp.c
diff --git a/openbsc/src/gprs/sgsn_main.c b/src/gprs/sgsn_main.c
similarity index 100%
rename from openbsc/src/gprs/sgsn_main.c
rename to src/gprs/sgsn_main.c
diff --git a/openbsc/src/gprs/sgsn_vty.c b/src/gprs/sgsn_vty.c
similarity index 100%
rename from openbsc/src/gprs/sgsn_vty.c
rename to src/gprs/sgsn_vty.c
diff --git a/openbsc/src/gprs/slhc.c b/src/gprs/slhc.c
similarity index 100%
rename from openbsc/src/gprs/slhc.c
rename to src/gprs/slhc.c
diff --git a/openbsc/src/gprs/v42bis.c b/src/gprs/v42bis.c
similarity index 100%
rename from openbsc/src/gprs/v42bis.c
rename to src/gprs/v42bis.c
diff --git a/openbsc/src/ipaccess/Makefile.am b/src/ipaccess/Makefile.am
similarity index 100%
rename from openbsc/src/ipaccess/Makefile.am
rename to src/ipaccess/Makefile.am
diff --git a/openbsc/src/ipaccess/abisip-find.c b/src/ipaccess/abisip-find.c
similarity index 100%
rename from openbsc/src/ipaccess/abisip-find.c
rename to src/ipaccess/abisip-find.c
diff --git a/openbsc/src/ipaccess/ipaccess-config.c b/src/ipaccess/ipaccess-config.c
similarity index 100%
rename from openbsc/src/ipaccess/ipaccess-config.c
rename to src/ipaccess/ipaccess-config.c
diff --git a/openbsc/src/ipaccess/ipaccess-firmware.c b/src/ipaccess/ipaccess-firmware.c
similarity index 100%
rename from openbsc/src/ipaccess/ipaccess-firmware.c
rename to src/ipaccess/ipaccess-firmware.c
diff --git a/openbsc/src/ipaccess/ipaccess-proxy.c b/src/ipaccess/ipaccess-proxy.c
similarity index 100%
rename from openbsc/src/ipaccess/ipaccess-proxy.c
rename to src/ipaccess/ipaccess-proxy.c
diff --git a/openbsc/src/ipaccess/network_listen.c b/src/ipaccess/network_listen.c
similarity index 100%
rename from openbsc/src/ipaccess/network_listen.c
rename to src/ipaccess/network_listen.c
diff --git a/openbsc/src/libbsc/Makefile.am b/src/libbsc/Makefile.am
similarity index 100%
rename from openbsc/src/libbsc/Makefile.am
rename to src/libbsc/Makefile.am
diff --git a/openbsc/src/libbsc/abis_nm.c b/src/libbsc/abis_nm.c
similarity index 100%
rename from openbsc/src/libbsc/abis_nm.c
rename to src/libbsc/abis_nm.c
diff --git a/openbsc/src/libbsc/abis_nm_ipaccess.c b/src/libbsc/abis_nm_ipaccess.c
similarity index 100%
rename from openbsc/src/libbsc/abis_nm_ipaccess.c
rename to src/libbsc/abis_nm_ipaccess.c
diff --git a/openbsc/src/libbsc/abis_nm_vty.c b/src/libbsc/abis_nm_vty.c
similarity index 100%
rename from openbsc/src/libbsc/abis_nm_vty.c
rename to src/libbsc/abis_nm_vty.c
diff --git a/openbsc/src/libbsc/abis_om2000.c b/src/libbsc/abis_om2000.c
similarity index 100%
rename from openbsc/src/libbsc/abis_om2000.c
rename to src/libbsc/abis_om2000.c
diff --git a/openbsc/src/libbsc/abis_om2000_vty.c b/src/libbsc/abis_om2000_vty.c
similarity index 100%
rename from openbsc/src/libbsc/abis_om2000_vty.c
rename to src/libbsc/abis_om2000_vty.c
diff --git a/openbsc/src/libbsc/abis_rsl.c b/src/libbsc/abis_rsl.c
similarity index 100%
rename from openbsc/src/libbsc/abis_rsl.c
rename to src/libbsc/abis_rsl.c
diff --git a/openbsc/src/libbsc/arfcn_range_encode.c b/src/libbsc/arfcn_range_encode.c
similarity index 100%
rename from openbsc/src/libbsc/arfcn_range_encode.c
rename to src/libbsc/arfcn_range_encode.c
diff --git a/openbsc/src/libbsc/bsc_api.c b/src/libbsc/bsc_api.c
similarity index 100%
rename from openbsc/src/libbsc/bsc_api.c
rename to src/libbsc/bsc_api.c
diff --git a/openbsc/src/libbsc/bsc_ctrl_commands.c b/src/libbsc/bsc_ctrl_commands.c
similarity index 100%
rename from openbsc/src/libbsc/bsc_ctrl_commands.c
rename to src/libbsc/bsc_ctrl_commands.c
diff --git a/openbsc/src/libbsc/bsc_ctrl_lookup.c b/src/libbsc/bsc_ctrl_lookup.c
similarity index 100%
rename from openbsc/src/libbsc/bsc_ctrl_lookup.c
rename to src/libbsc/bsc_ctrl_lookup.c
diff --git a/openbsc/src/libbsc/bsc_dyn_ts.c b/src/libbsc/bsc_dyn_ts.c
similarity index 100%
rename from openbsc/src/libbsc/bsc_dyn_ts.c
rename to src/libbsc/bsc_dyn_ts.c
diff --git a/openbsc/src/libbsc/bsc_init.c b/src/libbsc/bsc_init.c
similarity index 100%
rename from openbsc/src/libbsc/bsc_init.c
rename to src/libbsc/bsc_init.c
diff --git a/openbsc/src/libbsc/bsc_msc.c b/src/libbsc/bsc_msc.c
similarity index 100%
rename from openbsc/src/libbsc/bsc_msc.c
rename to src/libbsc/bsc_msc.c
diff --git a/openbsc/src/libbsc/bsc_rf_ctrl.c b/src/libbsc/bsc_rf_ctrl.c
similarity index 100%
rename from openbsc/src/libbsc/bsc_rf_ctrl.c
rename to src/libbsc/bsc_rf_ctrl.c
diff --git a/openbsc/src/libbsc/bsc_rll.c b/src/libbsc/bsc_rll.c
similarity index 100%
rename from openbsc/src/libbsc/bsc_rll.c
rename to src/libbsc/bsc_rll.c
diff --git a/openbsc/src/libbsc/bsc_subscriber.c b/src/libbsc/bsc_subscriber.c
similarity index 100%
rename from openbsc/src/libbsc/bsc_subscriber.c
rename to src/libbsc/bsc_subscriber.c
diff --git a/openbsc/src/libbsc/bsc_vty.c b/src/libbsc/bsc_vty.c
similarity index 100%
rename from openbsc/src/libbsc/bsc_vty.c
rename to src/libbsc/bsc_vty.c
diff --git a/openbsc/src/libbsc/bts_ericsson_rbs2000.c b/src/libbsc/bts_ericsson_rbs2000.c
similarity index 100%
rename from openbsc/src/libbsc/bts_ericsson_rbs2000.c
rename to src/libbsc/bts_ericsson_rbs2000.c
diff --git a/openbsc/src/libbsc/bts_init.c b/src/libbsc/bts_init.c
similarity index 100%
rename from openbsc/src/libbsc/bts_init.c
rename to src/libbsc/bts_init.c
diff --git a/openbsc/src/libbsc/bts_ipaccess_nanobts.c b/src/libbsc/bts_ipaccess_nanobts.c
similarity index 100%
rename from openbsc/src/libbsc/bts_ipaccess_nanobts.c
rename to src/libbsc/bts_ipaccess_nanobts.c
diff --git a/openbsc/src/libbsc/bts_ipaccess_nanobts_omlattr.c b/src/libbsc/bts_ipaccess_nanobts_omlattr.c
similarity index 100%
rename from openbsc/src/libbsc/bts_ipaccess_nanobts_omlattr.c
rename to src/libbsc/bts_ipaccess_nanobts_omlattr.c
diff --git a/openbsc/src/libbsc/bts_nokia_site.c b/src/libbsc/bts_nokia_site.c
similarity index 100%
rename from openbsc/src/libbsc/bts_nokia_site.c
rename to src/libbsc/bts_nokia_site.c
diff --git a/openbsc/src/libbsc/bts_siemens_bs11.c b/src/libbsc/bts_siemens_bs11.c
similarity index 100%
rename from openbsc/src/libbsc/bts_siemens_bs11.c
rename to src/libbsc/bts_siemens_bs11.c
diff --git a/openbsc/src/libbsc/bts_sysmobts.c b/src/libbsc/bts_sysmobts.c
similarity index 100%
rename from openbsc/src/libbsc/bts_sysmobts.c
rename to src/libbsc/bts_sysmobts.c
diff --git a/openbsc/src/libbsc/bts_unknown.c b/src/libbsc/bts_unknown.c
similarity index 100%
rename from openbsc/src/libbsc/bts_unknown.c
rename to src/libbsc/bts_unknown.c
diff --git a/openbsc/src/libbsc/chan_alloc.c b/src/libbsc/chan_alloc.c
similarity index 100%
rename from openbsc/src/libbsc/chan_alloc.c
rename to src/libbsc/chan_alloc.c
diff --git a/openbsc/src/libbsc/e1_config.c b/src/libbsc/e1_config.c
similarity index 100%
rename from openbsc/src/libbsc/e1_config.c
rename to src/libbsc/e1_config.c
diff --git a/openbsc/src/libbsc/gsm_04_08_utils.c b/src/libbsc/gsm_04_08_utils.c
similarity index 100%
rename from openbsc/src/libbsc/gsm_04_08_utils.c
rename to src/libbsc/gsm_04_08_utils.c
diff --git a/openbsc/src/libbsc/gsm_04_80_utils.c b/src/libbsc/gsm_04_80_utils.c
similarity index 100%
rename from openbsc/src/libbsc/gsm_04_80_utils.c
rename to src/libbsc/gsm_04_80_utils.c
diff --git a/openbsc/src/libbsc/handover_decision.c b/src/libbsc/handover_decision.c
similarity index 100%
rename from openbsc/src/libbsc/handover_decision.c
rename to src/libbsc/handover_decision.c
diff --git a/openbsc/src/libbsc/handover_logic.c b/src/libbsc/handover_logic.c
similarity index 100%
rename from openbsc/src/libbsc/handover_logic.c
rename to src/libbsc/handover_logic.c
diff --git a/openbsc/src/libbsc/meas_proc.c b/src/libbsc/meas_proc.c
similarity index 100%
rename from openbsc/src/libbsc/meas_proc.c
rename to src/libbsc/meas_proc.c
diff --git a/openbsc/src/libbsc/meas_rep.c b/src/libbsc/meas_rep.c
similarity index 100%
rename from openbsc/src/libbsc/meas_rep.c
rename to src/libbsc/meas_rep.c
diff --git a/openbsc/src/libbsc/net_init.c b/src/libbsc/net_init.c
similarity index 100%
rename from openbsc/src/libbsc/net_init.c
rename to src/libbsc/net_init.c
diff --git a/openbsc/src/libbsc/paging.c b/src/libbsc/paging.c
similarity index 100%
rename from openbsc/src/libbsc/paging.c
rename to src/libbsc/paging.c
diff --git a/openbsc/src/libbsc/pcu_sock.c b/src/libbsc/pcu_sock.c
similarity index 100%
rename from openbsc/src/libbsc/pcu_sock.c
rename to src/libbsc/pcu_sock.c
diff --git a/openbsc/src/libbsc/rest_octets.c b/src/libbsc/rest_octets.c
similarity index 100%
rename from openbsc/src/libbsc/rest_octets.c
rename to src/libbsc/rest_octets.c
diff --git a/openbsc/src/libbsc/system_information.c b/src/libbsc/system_information.c
similarity index 100%
rename from openbsc/src/libbsc/system_information.c
rename to src/libbsc/system_information.c
diff --git a/openbsc/src/libcommon-cs/Makefile.am b/src/libcommon-cs/Makefile.am
similarity index 100%
rename from openbsc/src/libcommon-cs/Makefile.am
rename to src/libcommon-cs/Makefile.am
diff --git a/openbsc/src/libcommon-cs/common_cs.c b/src/libcommon-cs/common_cs.c
similarity index 100%
rename from openbsc/src/libcommon-cs/common_cs.c
rename to src/libcommon-cs/common_cs.c
diff --git a/openbsc/src/libcommon-cs/common_cs_vty.c b/src/libcommon-cs/common_cs_vty.c
similarity index 100%
rename from openbsc/src/libcommon-cs/common_cs_vty.c
rename to src/libcommon-cs/common_cs_vty.c
diff --git a/openbsc/src/libcommon/Makefile.am b/src/libcommon/Makefile.am
similarity index 100%
rename from openbsc/src/libcommon/Makefile.am
rename to src/libcommon/Makefile.am
diff --git a/openbsc/src/libcommon/bsc_version.c b/src/libcommon/bsc_version.c
similarity index 100%
rename from openbsc/src/libcommon/bsc_version.c
rename to src/libcommon/bsc_version.c
diff --git a/openbsc/src/libcommon/common_vty.c b/src/libcommon/common_vty.c
similarity index 100%
rename from openbsc/src/libcommon/common_vty.c
rename to src/libcommon/common_vty.c
diff --git a/openbsc/src/libcommon/debug.c b/src/libcommon/debug.c
similarity index 100%
rename from openbsc/src/libcommon/debug.c
rename to src/libcommon/debug.c
diff --git a/openbsc/src/libcommon/gsm_data.c b/src/libcommon/gsm_data.c
similarity index 100%
rename from openbsc/src/libcommon/gsm_data.c
rename to src/libcommon/gsm_data.c
diff --git a/openbsc/src/libcommon/gsm_data_shared.c b/src/libcommon/gsm_data_shared.c
similarity index 100%
rename from openbsc/src/libcommon/gsm_data_shared.c
rename to src/libcommon/gsm_data_shared.c
diff --git a/openbsc/src/libcommon/gsm_subscriber_base.c b/src/libcommon/gsm_subscriber_base.c
similarity index 100%
rename from openbsc/src/libcommon/gsm_subscriber_base.c
rename to src/libcommon/gsm_subscriber_base.c
diff --git a/openbsc/src/libcommon/gsup_client.c b/src/libcommon/gsup_client.c
similarity index 100%
rename from openbsc/src/libcommon/gsup_client.c
rename to src/libcommon/gsup_client.c
diff --git a/openbsc/src/libcommon/gsup_test_client.c b/src/libcommon/gsup_test_client.c
similarity index 100%
rename from openbsc/src/libcommon/gsup_test_client.c
rename to src/libcommon/gsup_test_client.c
diff --git a/openbsc/src/libcommon/oap_client.c b/src/libcommon/oap_client.c
similarity index 100%
rename from openbsc/src/libcommon/oap_client.c
rename to src/libcommon/oap_client.c
diff --git a/openbsc/src/libcommon/socket.c b/src/libcommon/socket.c
similarity index 100%
rename from openbsc/src/libcommon/socket.c
rename to src/libcommon/socket.c
diff --git a/openbsc/src/libcommon/talloc_ctx.c b/src/libcommon/talloc_ctx.c
similarity index 100%
rename from openbsc/src/libcommon/talloc_ctx.c
rename to src/libcommon/talloc_ctx.c
diff --git a/openbsc/src/libfilter/Makefile.am b/src/libfilter/Makefile.am
similarity index 100%
rename from openbsc/src/libfilter/Makefile.am
rename to src/libfilter/Makefile.am
diff --git a/openbsc/src/libfilter/bsc_msg_acc.c b/src/libfilter/bsc_msg_acc.c
similarity index 100%
rename from openbsc/src/libfilter/bsc_msg_acc.c
rename to src/libfilter/bsc_msg_acc.c
diff --git a/openbsc/src/libfilter/bsc_msg_filter.c b/src/libfilter/bsc_msg_filter.c
similarity index 100%
rename from openbsc/src/libfilter/bsc_msg_filter.c
rename to src/libfilter/bsc_msg_filter.c
diff --git a/openbsc/src/libfilter/bsc_msg_vty.c b/src/libfilter/bsc_msg_vty.c
similarity index 100%
rename from openbsc/src/libfilter/bsc_msg_vty.c
rename to src/libfilter/bsc_msg_vty.c
diff --git a/openbsc/src/libiu/Makefile.am b/src/libiu/Makefile.am
similarity index 100%
rename from openbsc/src/libiu/Makefile.am
rename to src/libiu/Makefile.am
diff --git a/openbsc/src/libiu/iu.c b/src/libiu/iu.c
similarity index 100%
rename from openbsc/src/libiu/iu.c
rename to src/libiu/iu.c
diff --git a/openbsc/src/libiu/iu_vty.c b/src/libiu/iu_vty.c
similarity index 100%
rename from openbsc/src/libiu/iu_vty.c
rename to src/libiu/iu_vty.c
diff --git a/openbsc/src/libmgcp/Makefile.am b/src/libmgcp/Makefile.am
similarity index 100%
rename from openbsc/src/libmgcp/Makefile.am
rename to src/libmgcp/Makefile.am
diff --git a/openbsc/src/libmgcp/g711common.h b/src/libmgcp/g711common.h
similarity index 100%
rename from openbsc/src/libmgcp/g711common.h
rename to src/libmgcp/g711common.h
diff --git a/openbsc/src/libmgcp/mgcp_network.c b/src/libmgcp/mgcp_network.c
similarity index 100%
rename from openbsc/src/libmgcp/mgcp_network.c
rename to src/libmgcp/mgcp_network.c
diff --git a/openbsc/src/libmgcp/mgcp_osmux.c b/src/libmgcp/mgcp_osmux.c
similarity index 100%
rename from openbsc/src/libmgcp/mgcp_osmux.c
rename to src/libmgcp/mgcp_osmux.c
diff --git a/openbsc/src/libmgcp/mgcp_protocol.c b/src/libmgcp/mgcp_protocol.c
similarity index 100%
rename from openbsc/src/libmgcp/mgcp_protocol.c
rename to src/libmgcp/mgcp_protocol.c
diff --git a/openbsc/src/libmgcp/mgcp_sdp.c b/src/libmgcp/mgcp_sdp.c
similarity index 100%
rename from openbsc/src/libmgcp/mgcp_sdp.c
rename to src/libmgcp/mgcp_sdp.c
diff --git a/openbsc/src/libmgcp/mgcp_transcode.c b/src/libmgcp/mgcp_transcode.c
similarity index 100%
rename from openbsc/src/libmgcp/mgcp_transcode.c
rename to src/libmgcp/mgcp_transcode.c
diff --git a/openbsc/src/libmgcp/mgcp_vty.c b/src/libmgcp/mgcp_vty.c
similarity index 100%
rename from openbsc/src/libmgcp/mgcp_vty.c
rename to src/libmgcp/mgcp_vty.c
diff --git a/openbsc/src/libmsc/Makefile.am b/src/libmsc/Makefile.am
similarity index 100%
rename from openbsc/src/libmsc/Makefile.am
rename to src/libmsc/Makefile.am
diff --git a/openbsc/src/libmsc/auth.c b/src/libmsc/auth.c
similarity index 100%
rename from openbsc/src/libmsc/auth.c
rename to src/libmsc/auth.c
diff --git a/openbsc/src/libmsc/ctrl_commands.c b/src/libmsc/ctrl_commands.c
similarity index 100%
rename from openbsc/src/libmsc/ctrl_commands.c
rename to src/libmsc/ctrl_commands.c
diff --git a/openbsc/src/libmsc/db.c b/src/libmsc/db.c
similarity index 100%
rename from openbsc/src/libmsc/db.c
rename to src/libmsc/db.c
diff --git a/openbsc/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c
similarity index 100%
rename from openbsc/src/libmsc/gsm_04_08.c
rename to src/libmsc/gsm_04_08.c
diff --git a/openbsc/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c
similarity index 100%
rename from openbsc/src/libmsc/gsm_04_11.c
rename to src/libmsc/gsm_04_11.c
diff --git a/openbsc/src/libmsc/gsm_04_80.c b/src/libmsc/gsm_04_80.c
similarity index 100%
rename from openbsc/src/libmsc/gsm_04_80.c
rename to src/libmsc/gsm_04_80.c
diff --git a/openbsc/src/libmsc/gsm_subscriber.c b/src/libmsc/gsm_subscriber.c
similarity index 100%
rename from openbsc/src/libmsc/gsm_subscriber.c
rename to src/libmsc/gsm_subscriber.c
diff --git a/openbsc/src/libmsc/meas_feed.c b/src/libmsc/meas_feed.c
similarity index 100%
rename from openbsc/src/libmsc/meas_feed.c
rename to src/libmsc/meas_feed.c
diff --git a/openbsc/src/libmsc/meas_feed.h b/src/libmsc/meas_feed.h
similarity index 100%
rename from openbsc/src/libmsc/meas_feed.h
rename to src/libmsc/meas_feed.h
diff --git a/openbsc/src/libmsc/mncc.c b/src/libmsc/mncc.c
similarity index 100%
rename from openbsc/src/libmsc/mncc.c
rename to src/libmsc/mncc.c
diff --git a/openbsc/src/libmsc/mncc_builtin.c b/src/libmsc/mncc_builtin.c
similarity index 100%
rename from openbsc/src/libmsc/mncc_builtin.c
rename to src/libmsc/mncc_builtin.c
diff --git a/openbsc/src/libmsc/mncc_sock.c b/src/libmsc/mncc_sock.c
similarity index 100%
rename from openbsc/src/libmsc/mncc_sock.c
rename to src/libmsc/mncc_sock.c
diff --git a/openbsc/src/libmsc/osmo_msc.c b/src/libmsc/osmo_msc.c
similarity index 100%
rename from openbsc/src/libmsc/osmo_msc.c
rename to src/libmsc/osmo_msc.c
diff --git a/openbsc/src/libmsc/rrlp.c b/src/libmsc/rrlp.c
similarity index 100%
rename from openbsc/src/libmsc/rrlp.c
rename to src/libmsc/rrlp.c
diff --git a/openbsc/src/libmsc/silent_call.c b/src/libmsc/silent_call.c
similarity index 100%
rename from openbsc/src/libmsc/silent_call.c
rename to src/libmsc/silent_call.c
diff --git a/openbsc/src/libmsc/smpp_openbsc.c b/src/libmsc/smpp_openbsc.c
similarity index 100%
rename from openbsc/src/libmsc/smpp_openbsc.c
rename to src/libmsc/smpp_openbsc.c
diff --git a/openbsc/src/libmsc/smpp_smsc.c b/src/libmsc/smpp_smsc.c
similarity index 100%
rename from openbsc/src/libmsc/smpp_smsc.c
rename to src/libmsc/smpp_smsc.c
diff --git a/openbsc/src/libmsc/smpp_smsc.h b/src/libmsc/smpp_smsc.h
similarity index 100%
rename from openbsc/src/libmsc/smpp_smsc.h
rename to src/libmsc/smpp_smsc.h
diff --git a/openbsc/src/libmsc/smpp_utils.c b/src/libmsc/smpp_utils.c
similarity index 100%
rename from openbsc/src/libmsc/smpp_utils.c
rename to src/libmsc/smpp_utils.c
diff --git a/openbsc/src/libmsc/smpp_vty.c b/src/libmsc/smpp_vty.c
similarity index 100%
rename from openbsc/src/libmsc/smpp_vty.c
rename to src/libmsc/smpp_vty.c
diff --git a/openbsc/src/libmsc/sms_queue.c b/src/libmsc/sms_queue.c
similarity index 100%
rename from openbsc/src/libmsc/sms_queue.c
rename to src/libmsc/sms_queue.c
diff --git a/openbsc/src/libmsc/token_auth.c b/src/libmsc/token_auth.c
similarity index 100%
rename from openbsc/src/libmsc/token_auth.c
rename to src/libmsc/token_auth.c
diff --git a/openbsc/src/libmsc/transaction.c b/src/libmsc/transaction.c
similarity index 100%
rename from openbsc/src/libmsc/transaction.c
rename to src/libmsc/transaction.c
diff --git a/openbsc/src/libmsc/ussd.c b/src/libmsc/ussd.c
similarity index 100%
rename from openbsc/src/libmsc/ussd.c
rename to src/libmsc/ussd.c
diff --git a/openbsc/src/libmsc/vty_interface_layer3.c b/src/libmsc/vty_interface_layer3.c
similarity index 100%
rename from openbsc/src/libmsc/vty_interface_layer3.c
rename to src/libmsc/vty_interface_layer3.c
diff --git a/openbsc/src/libtrau/Makefile.am b/src/libtrau/Makefile.am
similarity index 100%
rename from openbsc/src/libtrau/Makefile.am
rename to src/libtrau/Makefile.am
diff --git a/openbsc/src/libtrau/rtp_proxy.c b/src/libtrau/rtp_proxy.c
similarity index 100%
rename from openbsc/src/libtrau/rtp_proxy.c
rename to src/libtrau/rtp_proxy.c
diff --git a/openbsc/src/libtrau/trau_mux.c b/src/libtrau/trau_mux.c
similarity index 100%
rename from openbsc/src/libtrau/trau_mux.c
rename to src/libtrau/trau_mux.c
diff --git a/openbsc/src/libtrau/trau_upqueue.c b/src/libtrau/trau_upqueue.c
similarity index 100%
rename from openbsc/src/libtrau/trau_upqueue.c
rename to src/libtrau/trau_upqueue.c
diff --git a/openbsc/src/osmo-bsc/Makefile.am b/src/osmo-bsc/Makefile.am
similarity index 100%
rename from openbsc/src/osmo-bsc/Makefile.am
rename to src/osmo-bsc/Makefile.am
diff --git a/openbsc/src/osmo-bsc/osmo_bsc_api.c b/src/osmo-bsc/osmo_bsc_api.c
similarity index 100%
rename from openbsc/src/osmo-bsc/osmo_bsc_api.c
rename to src/osmo-bsc/osmo_bsc_api.c
diff --git a/openbsc/src/osmo-bsc/osmo_bsc_audio.c b/src/osmo-bsc/osmo_bsc_audio.c
similarity index 100%
rename from openbsc/src/osmo-bsc/osmo_bsc_audio.c
rename to src/osmo-bsc/osmo_bsc_audio.c
diff --git a/openbsc/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c
similarity index 100%
rename from openbsc/src/osmo-bsc/osmo_bsc_bssap.c
rename to src/osmo-bsc/osmo_bsc_bssap.c
diff --git a/openbsc/src/osmo-bsc/osmo_bsc_ctrl.c b/src/osmo-bsc/osmo_bsc_ctrl.c
similarity index 100%
rename from openbsc/src/osmo-bsc/osmo_bsc_ctrl.c
rename to src/osmo-bsc/osmo_bsc_ctrl.c
diff --git a/openbsc/src/osmo-bsc/osmo_bsc_filter.c b/src/osmo-bsc/osmo_bsc_filter.c
similarity index 100%
rename from openbsc/src/osmo-bsc/osmo_bsc_filter.c
rename to src/osmo-bsc/osmo_bsc_filter.c
diff --git a/openbsc/src/osmo-bsc/osmo_bsc_grace.c b/src/osmo-bsc/osmo_bsc_grace.c
similarity index 100%
rename from openbsc/src/osmo-bsc/osmo_bsc_grace.c
rename to src/osmo-bsc/osmo_bsc_grace.c
diff --git a/openbsc/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c
similarity index 100%
rename from openbsc/src/osmo-bsc/osmo_bsc_main.c
rename to src/osmo-bsc/osmo_bsc_main.c
diff --git a/openbsc/src/osmo-bsc/osmo_bsc_msc.c b/src/osmo-bsc/osmo_bsc_msc.c
similarity index 100%
rename from openbsc/src/osmo-bsc/osmo_bsc_msc.c
rename to src/osmo-bsc/osmo_bsc_msc.c
diff --git a/openbsc/src/osmo-bsc/osmo_bsc_sccp.c b/src/osmo-bsc/osmo_bsc_sccp.c
similarity index 100%
rename from openbsc/src/osmo-bsc/osmo_bsc_sccp.c
rename to src/osmo-bsc/osmo_bsc_sccp.c
diff --git a/openbsc/src/osmo-bsc/osmo_bsc_vty.c b/src/osmo-bsc/osmo_bsc_vty.c
similarity index 100%
rename from openbsc/src/osmo-bsc/osmo_bsc_vty.c
rename to src/osmo-bsc/osmo_bsc_vty.c
diff --git a/openbsc/src/osmo-bsc_mgcp/Makefile.am b/src/osmo-bsc_mgcp/Makefile.am
similarity index 100%
rename from openbsc/src/osmo-bsc_mgcp/Makefile.am
rename to src/osmo-bsc_mgcp/Makefile.am
diff --git a/openbsc/src/osmo-bsc_mgcp/mgcp_main.c b/src/osmo-bsc_mgcp/mgcp_main.c
similarity index 100%
rename from openbsc/src/osmo-bsc_mgcp/mgcp_main.c
rename to src/osmo-bsc_mgcp/mgcp_main.c
diff --git a/openbsc/src/osmo-bsc_nat/Makefile.am b/src/osmo-bsc_nat/Makefile.am
similarity index 100%
rename from openbsc/src/osmo-bsc_nat/Makefile.am
rename to src/osmo-bsc_nat/Makefile.am
diff --git a/openbsc/src/osmo-bsc_nat/bsc_filter.c b/src/osmo-bsc_nat/bsc_filter.c
similarity index 100%
rename from openbsc/src/osmo-bsc_nat/bsc_filter.c
rename to src/osmo-bsc_nat/bsc_filter.c
diff --git a/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c b/src/osmo-bsc_nat/bsc_mgcp_utils.c
similarity index 100%
rename from openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c
rename to src/osmo-bsc_nat/bsc_mgcp_utils.c
diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat.c b/src/osmo-bsc_nat/bsc_nat.c
similarity index 100%
rename from openbsc/src/osmo-bsc_nat/bsc_nat.c
rename to src/osmo-bsc_nat/bsc_nat.c
diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat_ctrl.c b/src/osmo-bsc_nat/bsc_nat_ctrl.c
similarity index 100%
rename from openbsc/src/osmo-bsc_nat/bsc_nat_ctrl.c
rename to src/osmo-bsc_nat/bsc_nat_ctrl.c
diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat_filter.c b/src/osmo-bsc_nat/bsc_nat_filter.c
similarity index 100%
rename from openbsc/src/osmo-bsc_nat/bsc_nat_filter.c
rename to src/osmo-bsc_nat/bsc_nat_filter.c
diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat_rewrite.c b/src/osmo-bsc_nat/bsc_nat_rewrite.c
similarity index 100%
rename from openbsc/src/osmo-bsc_nat/bsc_nat_rewrite.c
rename to src/osmo-bsc_nat/bsc_nat_rewrite.c
diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat_rewrite_trie.c b/src/osmo-bsc_nat/bsc_nat_rewrite_trie.c
similarity index 100%
rename from openbsc/src/osmo-bsc_nat/bsc_nat_rewrite_trie.c
rename to src/osmo-bsc_nat/bsc_nat_rewrite_trie.c
diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat_utils.c b/src/osmo-bsc_nat/bsc_nat_utils.c
similarity index 100%
rename from openbsc/src/osmo-bsc_nat/bsc_nat_utils.c
rename to src/osmo-bsc_nat/bsc_nat_utils.c
diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c b/src/osmo-bsc_nat/bsc_nat_vty.c
similarity index 100%
rename from openbsc/src/osmo-bsc_nat/bsc_nat_vty.c
rename to src/osmo-bsc_nat/bsc_nat_vty.c
diff --git a/openbsc/src/osmo-bsc_nat/bsc_sccp.c b/src/osmo-bsc_nat/bsc_sccp.c
similarity index 100%
rename from openbsc/src/osmo-bsc_nat/bsc_sccp.c
rename to src/osmo-bsc_nat/bsc_sccp.c
diff --git a/openbsc/src/osmo-bsc_nat/bsc_ussd.c b/src/osmo-bsc_nat/bsc_ussd.c
similarity index 100%
rename from openbsc/src/osmo-bsc_nat/bsc_ussd.c
rename to src/osmo-bsc_nat/bsc_ussd.c
diff --git a/openbsc/src/osmo-nitb/Makefile.am b/src/osmo-nitb/Makefile.am
similarity index 100%
rename from openbsc/src/osmo-nitb/Makefile.am
rename to src/osmo-nitb/Makefile.am
diff --git a/openbsc/src/osmo-nitb/bsc_hack.c b/src/osmo-nitb/bsc_hack.c
similarity index 100%
rename from openbsc/src/osmo-nitb/bsc_hack.c
rename to src/osmo-nitb/bsc_hack.c
diff --git a/openbsc/src/utils/Makefile.am b/src/utils/Makefile.am
similarity index 100%
rename from openbsc/src/utils/Makefile.am
rename to src/utils/Makefile.am
diff --git a/openbsc/src/utils/bs11_config.c b/src/utils/bs11_config.c
similarity index 100%
rename from openbsc/src/utils/bs11_config.c
rename to src/utils/bs11_config.c
diff --git a/openbsc/src/utils/isdnsync.c b/src/utils/isdnsync.c
similarity index 100%
rename from openbsc/src/utils/isdnsync.c
rename to src/utils/isdnsync.c
diff --git a/openbsc/src/utils/meas_db.c b/src/utils/meas_db.c
similarity index 100%
rename from openbsc/src/utils/meas_db.c
rename to src/utils/meas_db.c
diff --git a/openbsc/src/utils/meas_db.h b/src/utils/meas_db.h
similarity index 100%
rename from openbsc/src/utils/meas_db.h
rename to src/utils/meas_db.h
diff --git a/openbsc/src/utils/meas_json.c b/src/utils/meas_json.c
similarity index 100%
rename from openbsc/src/utils/meas_json.c
rename to src/utils/meas_json.c
diff --git a/openbsc/src/utils/meas_pcap2db.c b/src/utils/meas_pcap2db.c
similarity index 100%
rename from openbsc/src/utils/meas_pcap2db.c
rename to src/utils/meas_pcap2db.c
diff --git a/openbsc/src/utils/meas_udp2db.c b/src/utils/meas_udp2db.c
similarity index 100%
rename from openbsc/src/utils/meas_udp2db.c
rename to src/utils/meas_udp2db.c
diff --git a/openbsc/src/utils/meas_vis.c b/src/utils/meas_vis.c
similarity index 100%
rename from openbsc/src/utils/meas_vis.c
rename to src/utils/meas_vis.c
diff --git a/openbsc/src/utils/smpp_mirror.c b/src/utils/smpp_mirror.c
similarity index 100%
rename from openbsc/src/utils/smpp_mirror.c
rename to src/utils/smpp_mirror.c
diff --git a/openbsc/tests/Makefile.am b/tests/Makefile.am
similarity index 100%
rename from openbsc/tests/Makefile.am
rename to tests/Makefile.am
diff --git a/openbsc/tests/abis/Makefile.am b/tests/abis/Makefile.am
similarity index 100%
rename from openbsc/tests/abis/Makefile.am
rename to tests/abis/Makefile.am
diff --git a/openbsc/tests/abis/abis_test.c b/tests/abis/abis_test.c
similarity index 100%
rename from openbsc/tests/abis/abis_test.c
rename to tests/abis/abis_test.c
diff --git a/openbsc/tests/abis/abis_test.ok b/tests/abis/abis_test.ok
similarity index 100%
rename from openbsc/tests/abis/abis_test.ok
rename to tests/abis/abis_test.ok
diff --git a/openbsc/tests/atlocal.in b/tests/atlocal.in
similarity index 100%
rename from openbsc/tests/atlocal.in
rename to tests/atlocal.in
diff --git a/openbsc/tests/bsc-nat-trie/Makefile.am b/tests/bsc-nat-trie/Makefile.am
similarity index 100%
rename from openbsc/tests/bsc-nat-trie/Makefile.am
rename to tests/bsc-nat-trie/Makefile.am
diff --git a/openbsc/tests/bsc-nat-trie/bsc_nat_trie_test.c b/tests/bsc-nat-trie/bsc_nat_trie_test.c
similarity index 100%
rename from openbsc/tests/bsc-nat-trie/bsc_nat_trie_test.c
rename to tests/bsc-nat-trie/bsc_nat_trie_test.c
diff --git a/openbsc/tests/bsc-nat-trie/bsc_nat_trie_test.ok b/tests/bsc-nat-trie/bsc_nat_trie_test.ok
similarity index 100%
rename from openbsc/tests/bsc-nat-trie/bsc_nat_trie_test.ok
rename to tests/bsc-nat-trie/bsc_nat_trie_test.ok
diff --git a/openbsc/tests/bsc-nat-trie/prefixes.csv b/tests/bsc-nat-trie/prefixes.csv
similarity index 100%
rename from openbsc/tests/bsc-nat-trie/prefixes.csv
rename to tests/bsc-nat-trie/prefixes.csv
diff --git a/openbsc/tests/bsc-nat/Makefile.am b/tests/bsc-nat/Makefile.am
similarity index 100%
rename from openbsc/tests/bsc-nat/Makefile.am
rename to tests/bsc-nat/Makefile.am
diff --git a/openbsc/tests/bsc-nat/barr.cfg b/tests/bsc-nat/barr.cfg
similarity index 100%
rename from openbsc/tests/bsc-nat/barr.cfg
rename to tests/bsc-nat/barr.cfg
diff --git a/openbsc/tests/bsc-nat/barr_dup.cfg b/tests/bsc-nat/barr_dup.cfg
similarity index 100%
rename from openbsc/tests/bsc-nat/barr_dup.cfg
rename to tests/bsc-nat/barr_dup.cfg
diff --git a/openbsc/tests/bsc-nat/bsc_data.c b/tests/bsc-nat/bsc_data.c
similarity index 100%
rename from openbsc/tests/bsc-nat/bsc_data.c
rename to tests/bsc-nat/bsc_data.c
diff --git a/openbsc/tests/bsc-nat/bsc_nat_test.c b/tests/bsc-nat/bsc_nat_test.c
similarity index 100%
rename from openbsc/tests/bsc-nat/bsc_nat_test.c
rename to tests/bsc-nat/bsc_nat_test.c
diff --git a/openbsc/tests/bsc-nat/bsc_nat_test.ok b/tests/bsc-nat/bsc_nat_test.ok
similarity index 100%
rename from openbsc/tests/bsc-nat/bsc_nat_test.ok
rename to tests/bsc-nat/bsc_nat_test.ok
diff --git a/openbsc/tests/bsc-nat/prefixes.csv b/tests/bsc-nat/prefixes.csv
similarity index 100%
rename from openbsc/tests/bsc-nat/prefixes.csv
rename to tests/bsc-nat/prefixes.csv
diff --git a/openbsc/tests/bsc/Makefile.am b/tests/bsc/Makefile.am
similarity index 100%
rename from openbsc/tests/bsc/Makefile.am
rename to tests/bsc/Makefile.am
diff --git a/openbsc/tests/bsc/bsc_test.c b/tests/bsc/bsc_test.c
similarity index 100%
rename from openbsc/tests/bsc/bsc_test.c
rename to tests/bsc/bsc_test.c
diff --git a/openbsc/tests/bsc/bsc_test.ok b/tests/bsc/bsc_test.ok
similarity index 100%
rename from openbsc/tests/bsc/bsc_test.ok
rename to tests/bsc/bsc_test.ok
diff --git a/openbsc/tests/channel/Makefile.am b/tests/channel/Makefile.am
similarity index 100%
rename from openbsc/tests/channel/Makefile.am
rename to tests/channel/Makefile.am
diff --git a/openbsc/tests/channel/channel_test.c b/tests/channel/channel_test.c
similarity index 100%
rename from openbsc/tests/channel/channel_test.c
rename to tests/channel/channel_test.c
diff --git a/openbsc/tests/channel/channel_test.ok b/tests/channel/channel_test.ok
similarity index 100%
rename from openbsc/tests/channel/channel_test.ok
rename to tests/channel/channel_test.ok
diff --git a/openbsc/tests/ctrl_test_runner.py b/tests/ctrl_test_runner.py
similarity index 100%
rename from openbsc/tests/ctrl_test_runner.py
rename to tests/ctrl_test_runner.py
diff --git a/openbsc/tests/db/Makefile.am b/tests/db/Makefile.am
similarity index 100%
rename from openbsc/tests/db/Makefile.am
rename to tests/db/Makefile.am
diff --git a/openbsc/tests/db/db_test.c b/tests/db/db_test.c
similarity index 100%
rename from openbsc/tests/db/db_test.c
rename to tests/db/db_test.c
diff --git a/openbsc/tests/db/db_test.err b/tests/db/db_test.err
similarity index 100%
rename from openbsc/tests/db/db_test.err
rename to tests/db/db_test.err
diff --git a/openbsc/tests/db/db_test.ok b/tests/db/db_test.ok
similarity index 100%
rename from openbsc/tests/db/db_test.ok
rename to tests/db/db_test.ok
diff --git a/openbsc/tests/db/hlr.sqlite3 b/tests/db/hlr.sqlite3
similarity index 100%
rename from openbsc/tests/db/hlr.sqlite3
rename to tests/db/hlr.sqlite3
Binary files differ
diff --git a/openbsc/tests/gbproxy/Makefile.am b/tests/gbproxy/Makefile.am
similarity index 100%
rename from openbsc/tests/gbproxy/Makefile.am
rename to tests/gbproxy/Makefile.am
diff --git a/openbsc/tests/gbproxy/gbproxy_test.c b/tests/gbproxy/gbproxy_test.c
similarity index 100%
rename from openbsc/tests/gbproxy/gbproxy_test.c
rename to tests/gbproxy/gbproxy_test.c
diff --git a/openbsc/tests/gbproxy/gbproxy_test.ok b/tests/gbproxy/gbproxy_test.ok
similarity index 100%
rename from openbsc/tests/gbproxy/gbproxy_test.ok
rename to tests/gbproxy/gbproxy_test.ok
diff --git a/openbsc/tests/gprs/Makefile.am b/tests/gprs/Makefile.am
similarity index 100%
rename from openbsc/tests/gprs/Makefile.am
rename to tests/gprs/Makefile.am
diff --git a/openbsc/tests/gprs/gprs_test.c b/tests/gprs/gprs_test.c
similarity index 100%
rename from openbsc/tests/gprs/gprs_test.c
rename to tests/gprs/gprs_test.c
diff --git a/openbsc/tests/gprs/gprs_test.ok b/tests/gprs/gprs_test.ok
similarity index 100%
rename from openbsc/tests/gprs/gprs_test.ok
rename to tests/gprs/gprs_test.ok
diff --git a/openbsc/tests/gsm0408/Makefile.am b/tests/gsm0408/Makefile.am
similarity index 100%
rename from openbsc/tests/gsm0408/Makefile.am
rename to tests/gsm0408/Makefile.am
diff --git a/openbsc/tests/gsm0408/gsm0408_test.c b/tests/gsm0408/gsm0408_test.c
similarity index 100%
rename from openbsc/tests/gsm0408/gsm0408_test.c
rename to tests/gsm0408/gsm0408_test.c
diff --git a/openbsc/tests/gsm0408/gsm0408_test.ok b/tests/gsm0408/gsm0408_test.ok
similarity index 100%
rename from openbsc/tests/gsm0408/gsm0408_test.ok
rename to tests/gsm0408/gsm0408_test.ok
diff --git a/openbsc/tests/gtphub/Makefile.am b/tests/gtphub/Makefile.am
similarity index 100%
rename from openbsc/tests/gtphub/Makefile.am
rename to tests/gtphub/Makefile.am
diff --git a/openbsc/tests/gtphub/gtphub_test.c b/tests/gtphub/gtphub_test.c
similarity index 100%
rename from openbsc/tests/gtphub/gtphub_test.c
rename to tests/gtphub/gtphub_test.c
diff --git a/openbsc/tests/gtphub/gtphub_test.ok b/tests/gtphub/gtphub_test.ok
similarity index 100%
rename from openbsc/tests/gtphub/gtphub_test.ok
rename to tests/gtphub/gtphub_test.ok
diff --git a/openbsc/tests/mgcp/Makefile.am b/tests/mgcp/Makefile.am
similarity index 100%
rename from openbsc/tests/mgcp/Makefile.am
rename to tests/mgcp/Makefile.am
diff --git a/openbsc/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c
similarity index 100%
rename from openbsc/tests/mgcp/mgcp_test.c
rename to tests/mgcp/mgcp_test.c
diff --git a/openbsc/tests/mgcp/mgcp_test.ok b/tests/mgcp/mgcp_test.ok
similarity index 100%
rename from openbsc/tests/mgcp/mgcp_test.ok
rename to tests/mgcp/mgcp_test.ok
diff --git a/openbsc/tests/mgcp/mgcp_transcoding_test.c b/tests/mgcp/mgcp_transcoding_test.c
similarity index 100%
rename from openbsc/tests/mgcp/mgcp_transcoding_test.c
rename to tests/mgcp/mgcp_transcoding_test.c
diff --git a/openbsc/tests/mgcp/mgcp_transcoding_test.ok b/tests/mgcp/mgcp_transcoding_test.ok
similarity index 100%
rename from openbsc/tests/mgcp/mgcp_transcoding_test.ok
rename to tests/mgcp/mgcp_transcoding_test.ok
diff --git a/openbsc/tests/mm_auth/Makefile.am b/tests/mm_auth/Makefile.am
similarity index 100%
rename from openbsc/tests/mm_auth/Makefile.am
rename to tests/mm_auth/Makefile.am
diff --git a/openbsc/tests/mm_auth/mm_auth_test.c b/tests/mm_auth/mm_auth_test.c
similarity index 100%
rename from openbsc/tests/mm_auth/mm_auth_test.c
rename to tests/mm_auth/mm_auth_test.c
diff --git a/openbsc/tests/mm_auth/mm_auth_test.ok b/tests/mm_auth/mm_auth_test.ok
similarity index 100%
rename from openbsc/tests/mm_auth/mm_auth_test.ok
rename to tests/mm_auth/mm_auth_test.ok
diff --git a/openbsc/tests/nanobts_omlattr/Makefile.am b/tests/nanobts_omlattr/Makefile.am
similarity index 100%
rename from openbsc/tests/nanobts_omlattr/Makefile.am
rename to tests/nanobts_omlattr/Makefile.am
diff --git a/openbsc/tests/nanobts_omlattr/nanobts_omlattr_test.c b/tests/nanobts_omlattr/nanobts_omlattr_test.c
similarity index 100%
rename from openbsc/tests/nanobts_omlattr/nanobts_omlattr_test.c
rename to tests/nanobts_omlattr/nanobts_omlattr_test.c
diff --git a/openbsc/tests/nanobts_omlattr/nanobts_omlattr_test.ok b/tests/nanobts_omlattr/nanobts_omlattr_test.ok
similarity index 100%
rename from openbsc/tests/nanobts_omlattr/nanobts_omlattr_test.ok
rename to tests/nanobts_omlattr/nanobts_omlattr_test.ok
diff --git a/openbsc/tests/oap/Makefile.am b/tests/oap/Makefile.am
similarity index 100%
rename from openbsc/tests/oap/Makefile.am
rename to tests/oap/Makefile.am
diff --git a/openbsc/tests/oap/oap_client_test.c b/tests/oap/oap_client_test.c
similarity index 100%
rename from openbsc/tests/oap/oap_client_test.c
rename to tests/oap/oap_client_test.c
diff --git a/openbsc/tests/oap/oap_client_test.err b/tests/oap/oap_client_test.err
similarity index 100%
rename from openbsc/tests/oap/oap_client_test.err
rename to tests/oap/oap_client_test.err
diff --git a/openbsc/tests/oap/oap_client_test.ok b/tests/oap/oap_client_test.ok
similarity index 100%
rename from openbsc/tests/oap/oap_client_test.ok
rename to tests/oap/oap_client_test.ok
diff --git a/openbsc/tests/sgsn/Makefile.am b/tests/sgsn/Makefile.am
similarity index 100%
rename from openbsc/tests/sgsn/Makefile.am
rename to tests/sgsn/Makefile.am
diff --git a/openbsc/tests/sgsn/sgsn_test.c b/tests/sgsn/sgsn_test.c
similarity index 100%
rename from openbsc/tests/sgsn/sgsn_test.c
rename to tests/sgsn/sgsn_test.c
diff --git a/openbsc/tests/sgsn/sgsn_test.ok b/tests/sgsn/sgsn_test.ok
similarity index 100%
rename from openbsc/tests/sgsn/sgsn_test.ok
rename to tests/sgsn/sgsn_test.ok
diff --git a/openbsc/tests/slhc/Makefile.am b/tests/slhc/Makefile.am
similarity index 100%
rename from openbsc/tests/slhc/Makefile.am
rename to tests/slhc/Makefile.am
diff --git a/openbsc/tests/slhc/slhc_test.c b/tests/slhc/slhc_test.c
similarity index 100%
rename from openbsc/tests/slhc/slhc_test.c
rename to tests/slhc/slhc_test.c
diff --git a/openbsc/tests/slhc/slhc_test.ok b/tests/slhc/slhc_test.ok
similarity index 100%
rename from openbsc/tests/slhc/slhc_test.ok
rename to tests/slhc/slhc_test.ok
diff --git a/openbsc/tests/smpp/Makefile.am b/tests/smpp/Makefile.am
similarity index 100%
rename from openbsc/tests/smpp/Makefile.am
rename to tests/smpp/Makefile.am
diff --git a/openbsc/tests/smpp/smpp_test.c b/tests/smpp/smpp_test.c
similarity index 100%
rename from openbsc/tests/smpp/smpp_test.c
rename to tests/smpp/smpp_test.c
diff --git a/openbsc/tests/smpp/smpp_test.err b/tests/smpp/smpp_test.err
similarity index 100%
rename from openbsc/tests/smpp/smpp_test.err
rename to tests/smpp/smpp_test.err
diff --git a/openbsc/tests/smpp/smpp_test.ok b/tests/smpp/smpp_test.ok
similarity index 100%
rename from openbsc/tests/smpp/smpp_test.ok
rename to tests/smpp/smpp_test.ok
diff --git a/openbsc/tests/smpp_test_runner.py b/tests/smpp_test_runner.py
similarity index 100%
rename from openbsc/tests/smpp_test_runner.py
rename to tests/smpp_test_runner.py
diff --git a/openbsc/tests/sndcp_xid/Makefile.am b/tests/sndcp_xid/Makefile.am
similarity index 100%
rename from openbsc/tests/sndcp_xid/Makefile.am
rename to tests/sndcp_xid/Makefile.am
diff --git a/openbsc/tests/sndcp_xid/sndcp_xid_test.c b/tests/sndcp_xid/sndcp_xid_test.c
similarity index 100%
rename from openbsc/tests/sndcp_xid/sndcp_xid_test.c
rename to tests/sndcp_xid/sndcp_xid_test.c
diff --git a/openbsc/tests/sndcp_xid/sndcp_xid_test.ok b/tests/sndcp_xid/sndcp_xid_test.ok
similarity index 100%
rename from openbsc/tests/sndcp_xid/sndcp_xid_test.ok
rename to tests/sndcp_xid/sndcp_xid_test.ok
diff --git a/openbsc/tests/subscr/Makefile.am b/tests/subscr/Makefile.am
similarity index 100%
rename from openbsc/tests/subscr/Makefile.am
rename to tests/subscr/Makefile.am
diff --git a/openbsc/tests/subscr/bsc_subscr_test.c b/tests/subscr/bsc_subscr_test.c
similarity index 100%
rename from openbsc/tests/subscr/bsc_subscr_test.c
rename to tests/subscr/bsc_subscr_test.c
diff --git a/openbsc/tests/subscr/bsc_subscr_test.err b/tests/subscr/bsc_subscr_test.err
similarity index 100%
rename from openbsc/tests/subscr/bsc_subscr_test.err
rename to tests/subscr/bsc_subscr_test.err
diff --git a/openbsc/tests/subscr/bsc_subscr_test.ok b/tests/subscr/bsc_subscr_test.ok
similarity index 100%
rename from openbsc/tests/subscr/bsc_subscr_test.ok
rename to tests/subscr/bsc_subscr_test.ok
diff --git a/openbsc/tests/subscr/subscr_test.c b/tests/subscr/subscr_test.c
similarity index 100%
rename from openbsc/tests/subscr/subscr_test.c
rename to tests/subscr/subscr_test.c
diff --git a/openbsc/tests/subscr/subscr_test.ok b/tests/subscr/subscr_test.ok
similarity index 100%
rename from openbsc/tests/subscr/subscr_test.ok
rename to tests/subscr/subscr_test.ok
diff --git a/openbsc/tests/testsuite.at b/tests/testsuite.at
similarity index 100%
rename from openbsc/tests/testsuite.at
rename to tests/testsuite.at
diff --git a/openbsc/tests/trau/Makefile.am b/tests/trau/Makefile.am
similarity index 100%
rename from openbsc/tests/trau/Makefile.am
rename to tests/trau/Makefile.am
diff --git a/openbsc/tests/trau/trau_test.c b/tests/trau/trau_test.c
similarity index 100%
rename from openbsc/tests/trau/trau_test.c
rename to tests/trau/trau_test.c
diff --git a/openbsc/tests/trau/trau_test.ok b/tests/trau/trau_test.ok
similarity index 100%
rename from openbsc/tests/trau/trau_test.ok
rename to tests/trau/trau_test.ok
diff --git a/openbsc/tests/v42bis/Makefile.am b/tests/v42bis/Makefile.am
similarity index 100%
rename from openbsc/tests/v42bis/Makefile.am
rename to tests/v42bis/Makefile.am
diff --git a/openbsc/tests/v42bis/v42bis_test.c b/tests/v42bis/v42bis_test.c
similarity index 100%
rename from openbsc/tests/v42bis/v42bis_test.c
rename to tests/v42bis/v42bis_test.c
diff --git a/openbsc/tests/v42bis/v42bis_test.ok b/tests/v42bis/v42bis_test.ok
similarity index 100%
rename from openbsc/tests/v42bis/v42bis_test.ok
rename to tests/v42bis/v42bis_test.ok
diff --git a/openbsc/tests/vty_test_runner.py b/tests/vty_test_runner.py
similarity index 100%
rename from openbsc/tests/vty_test_runner.py
rename to tests/vty_test_runner.py
diff --git a/openbsc/tests/xid/Makefile.am b/tests/xid/Makefile.am
similarity index 100%
rename from openbsc/tests/xid/Makefile.am
rename to tests/xid/Makefile.am
diff --git a/openbsc/tests/xid/xid_test.c b/tests/xid/xid_test.c
similarity index 100%
rename from openbsc/tests/xid/xid_test.c
rename to tests/xid/xid_test.c
diff --git a/openbsc/tests/xid/xid_test.ok b/tests/xid/xid_test.ok
similarity index 100%
rename from openbsc/tests/xid/xid_test.ok
rename to tests/xid/xid_test.ok
diff --git a/openbsc/tools/hlrstat.pl b/tools/hlrstat.pl
similarity index 100%
rename from openbsc/tools/hlrstat.pl
rename to tools/hlrstat.pl