diff --git a/AUTHORS b/openbsc/AUTHORS
similarity index 100%
rename from AUTHORS
rename to openbsc/AUTHORS
diff --git a/COPYING b/openbsc/COPYING
similarity index 100%
rename from COPYING
rename to openbsc/COPYING
diff --git a/Makefile.am b/openbsc/Makefile.am
similarity index 100%
rename from Makefile.am
rename to openbsc/Makefile.am
diff --git a/README b/openbsc/README
similarity index 100%
rename from README
rename to openbsc/README
diff --git a/configure.in b/openbsc/configure.in
similarity index 100%
rename from configure.in
rename to openbsc/configure.in
diff --git a/doc/BS11-OML.txt b/openbsc/doc/BS11-OML.txt
similarity index 100%
rename from doc/BS11-OML.txt
rename to openbsc/doc/BS11-OML.txt
diff --git a/doc/call-routing.txt b/openbsc/doc/call-routing.txt
similarity index 100%
rename from doc/call-routing.txt
rename to openbsc/doc/call-routing.txt
diff --git a/doc/e1-data-model.txt b/openbsc/doc/e1-data-model.txt
similarity index 100%
rename from doc/e1-data-model.txt
rename to openbsc/doc/e1-data-model.txt
diff --git a/include/Makefile.am b/openbsc/include/Makefile.am
similarity index 100%
rename from include/Makefile.am
rename to openbsc/include/Makefile.am
diff --git a/include/compat_af_isdn.h b/openbsc/include/compat_af_isdn.h
similarity index 100%
rename from include/compat_af_isdn.h
rename to openbsc/include/compat_af_isdn.h
diff --git a/include/mISDNif.h b/openbsc/include/mISDNif.h
similarity index 100%
rename from include/mISDNif.h
rename to openbsc/include/mISDNif.h
diff --git a/include/openbsc/Makefile.am b/openbsc/include/openbsc/Makefile.am
similarity index 100%
rename from include/openbsc/Makefile.am
rename to openbsc/include/openbsc/Makefile.am
diff --git a/include/openbsc/abis_nm.h b/openbsc/include/openbsc/abis_nm.h
similarity index 100%
rename from include/openbsc/abis_nm.h
rename to openbsc/include/openbsc/abis_nm.h
diff --git a/include/openbsc/abis_rsl.h b/openbsc/include/openbsc/abis_rsl.h
similarity index 100%
rename from include/openbsc/abis_rsl.h
rename to openbsc/include/openbsc/abis_rsl.h
diff --git a/include/openbsc/call_handling.h b/openbsc/include/openbsc/call_handling.h
similarity index 100%
rename from include/openbsc/call_handling.h
rename to openbsc/include/openbsc/call_handling.h
diff --git a/include/openbsc/chan_alloc.h b/openbsc/include/openbsc/chan_alloc.h
similarity index 100%
rename from include/openbsc/chan_alloc.h
rename to openbsc/include/openbsc/chan_alloc.h
diff --git a/include/openbsc/db.h b/openbsc/include/openbsc/db.h
similarity index 100%
rename from include/openbsc/db.h
rename to openbsc/include/openbsc/db.h
diff --git a/include/openbsc/debug.h b/openbsc/include/openbsc/debug.h
similarity index 100%
rename from include/openbsc/debug.h
rename to openbsc/include/openbsc/debug.h
diff --git a/include/openbsc/e1_input.h b/openbsc/include/openbsc/e1_input.h
similarity index 100%
rename from include/openbsc/e1_input.h
rename to openbsc/include/openbsc/e1_input.h
diff --git a/include/openbsc/gsm_04_08.h b/openbsc/include/openbsc/gsm_04_08.h
similarity index 100%
rename from include/openbsc/gsm_04_08.h
rename to openbsc/include/openbsc/gsm_04_08.h
diff --git a/include/openbsc/gsm_04_11.h b/openbsc/include/openbsc/gsm_04_11.h
similarity index 100%
rename from include/openbsc/gsm_04_11.h
rename to openbsc/include/openbsc/gsm_04_11.h
diff --git a/include/openbsc/gsm_data.h b/openbsc/include/openbsc/gsm_data.h
similarity index 100%
rename from include/openbsc/gsm_data.h
rename to openbsc/include/openbsc/gsm_data.h
diff --git a/include/openbsc/gsm_subscriber.h b/openbsc/include/openbsc/gsm_subscriber.h
similarity index 100%
rename from include/openbsc/gsm_subscriber.h
rename to openbsc/include/openbsc/gsm_subscriber.h
diff --git a/include/openbsc/gsm_utils.h b/openbsc/include/openbsc/gsm_utils.h
similarity index 100%
rename from include/openbsc/gsm_utils.h
rename to openbsc/include/openbsc/gsm_utils.h
diff --git a/include/openbsc/ipaccess.h b/openbsc/include/openbsc/ipaccess.h
similarity index 100%
rename from include/openbsc/ipaccess.h
rename to openbsc/include/openbsc/ipaccess.h
diff --git a/include/openbsc/linuxlist.h b/openbsc/include/openbsc/linuxlist.h
similarity index 100%
rename from include/openbsc/linuxlist.h
rename to openbsc/include/openbsc/linuxlist.h
diff --git a/include/openbsc/misdn.h b/openbsc/include/openbsc/misdn.h
similarity index 100%
rename from include/openbsc/misdn.h
rename to openbsc/include/openbsc/misdn.h
diff --git a/include/openbsc/msgb.h b/openbsc/include/openbsc/msgb.h
similarity index 100%
rename from include/openbsc/msgb.h
rename to openbsc/include/openbsc/msgb.h
diff --git a/include/openbsc/openbscdefines.h b/openbsc/include/openbsc/openbscdefines.h
similarity index 100%
rename from include/openbsc/openbscdefines.h
rename to openbsc/include/openbsc/openbscdefines.h
diff --git a/include/openbsc/paging.h b/openbsc/include/openbsc/paging.h
similarity index 100%
rename from include/openbsc/paging.h
rename to openbsc/include/openbsc/paging.h
diff --git a/include/openbsc/rs232.h b/openbsc/include/openbsc/rs232.h
similarity index 100%
rename from include/openbsc/rs232.h
rename to openbsc/include/openbsc/rs232.h
diff --git a/include/openbsc/select.h b/openbsc/include/openbsc/select.h
similarity index 100%
rename from include/openbsc/select.h
rename to openbsc/include/openbsc/select.h
diff --git a/include/openbsc/signal.h b/openbsc/include/openbsc/signal.h
similarity index 100%
rename from include/openbsc/signal.h
rename to openbsc/include/openbsc/signal.h
diff --git a/include/openbsc/subchan_demux.h b/openbsc/include/openbsc/subchan_demux.h
similarity index 100%
rename from include/openbsc/subchan_demux.h
rename to openbsc/include/openbsc/subchan_demux.h
diff --git a/include/openbsc/telnet_interface.h b/openbsc/include/openbsc/telnet_interface.h
similarity index 100%
rename from include/openbsc/telnet_interface.h
rename to openbsc/include/openbsc/telnet_interface.h
diff --git a/include/openbsc/timer.h b/openbsc/include/openbsc/timer.h
similarity index 100%
rename from include/openbsc/timer.h
rename to openbsc/include/openbsc/timer.h
diff --git a/include/openbsc/tlv.h b/openbsc/include/openbsc/tlv.h
similarity index 100%
rename from include/openbsc/tlv.h
rename to openbsc/include/openbsc/tlv.h
diff --git a/include/openbsc/trau_frame.h b/openbsc/include/openbsc/trau_frame.h
similarity index 100%
rename from include/openbsc/trau_frame.h
rename to openbsc/include/openbsc/trau_frame.h
diff --git a/include/openbsc/trau_mux.h b/openbsc/include/openbsc/trau_mux.h
similarity index 100%
rename from include/openbsc/trau_mux.h
rename to openbsc/include/openbsc/trau_mux.h
diff --git a/include/vty/Makefile.am b/openbsc/include/vty/Makefile.am
similarity index 100%
rename from include/vty/Makefile.am
rename to openbsc/include/vty/Makefile.am
diff --git a/include/vty/buffer.h b/openbsc/include/vty/buffer.h
similarity index 100%
rename from include/vty/buffer.h
rename to openbsc/include/vty/buffer.h
diff --git a/include/vty/command.h b/openbsc/include/vty/command.h
similarity index 100%
rename from include/vty/command.h
rename to openbsc/include/vty/command.h
diff --git a/include/vty/vector.h b/openbsc/include/vty/vector.h
similarity index 100%
rename from include/vty/vector.h
rename to openbsc/include/vty/vector.h
diff --git a/include/vty/vty.h b/openbsc/include/vty/vty.h
similarity index 100%
rename from include/vty/vty.h
rename to openbsc/include/vty/vty.h
diff --git a/openbsc.pc.in b/openbsc/openbsc.pc.in
similarity index 100%
rename from openbsc.pc.in
rename to openbsc/openbsc.pc.in
diff --git a/src/Makefile.am b/openbsc/src/Makefile.am
similarity index 100%
rename from src/Makefile.am
rename to openbsc/src/Makefile.am
diff --git a/src/abis_nm.c b/openbsc/src/abis_nm.c
similarity index 100%
rename from src/abis_nm.c
rename to openbsc/src/abis_nm.c
diff --git a/src/abis_rsl.c b/openbsc/src/abis_rsl.c
similarity index 100%
rename from src/abis_rsl.c
rename to openbsc/src/abis_rsl.c
diff --git a/src/bs11_config.c b/openbsc/src/bs11_config.c
similarity index 100%
rename from src/bs11_config.c
rename to openbsc/src/bs11_config.c
diff --git a/src/bsc_hack.c b/openbsc/src/bsc_hack.c
similarity index 100%
rename from src/bsc_hack.c
rename to openbsc/src/bsc_hack.c
diff --git a/src/chan_alloc.c b/openbsc/src/chan_alloc.c
similarity index 100%
rename from src/chan_alloc.c
rename to openbsc/src/chan_alloc.c
diff --git a/src/db.c b/openbsc/src/db.c
similarity index 100%
rename from src/db.c
rename to openbsc/src/db.c
diff --git a/src/debug.c b/openbsc/src/debug.c
similarity index 100%
rename from src/debug.c
rename to openbsc/src/debug.c
diff --git a/src/e1_config.c b/openbsc/src/e1_config.c
similarity index 100%
rename from src/e1_config.c
rename to openbsc/src/e1_config.c
diff --git a/src/e1_input.c b/openbsc/src/e1_input.c
similarity index 100%
rename from src/e1_input.c
rename to openbsc/src/e1_input.c
diff --git a/src/gsm_04_08.c b/openbsc/src/gsm_04_08.c
similarity index 100%
rename from src/gsm_04_08.c
rename to openbsc/src/gsm_04_08.c
diff --git a/src/gsm_04_11.c b/openbsc/src/gsm_04_11.c
similarity index 100%
rename from src/gsm_04_11.c
rename to openbsc/src/gsm_04_11.c
diff --git a/src/gsm_data.c b/openbsc/src/gsm_data.c
similarity index 100%
rename from src/gsm_data.c
rename to openbsc/src/gsm_data.c
diff --git a/src/gsm_subscriber.c b/openbsc/src/gsm_subscriber.c
similarity index 100%
rename from src/gsm_subscriber.c
rename to openbsc/src/gsm_subscriber.c
diff --git a/src/gsm_utils.c b/openbsc/src/gsm_utils.c
similarity index 100%
rename from src/gsm_utils.c
rename to openbsc/src/gsm_utils.c
diff --git a/src/input/ipaccess.c b/openbsc/src/input/ipaccess.c
similarity index 100%
rename from src/input/ipaccess.c
rename to openbsc/src/input/ipaccess.c
diff --git a/src/input/misdn.c b/openbsc/src/input/misdn.c
similarity index 100%
rename from src/input/misdn.c
rename to openbsc/src/input/misdn.c
diff --git a/src/ipaccess-config.c b/openbsc/src/ipaccess-config.c
similarity index 100%
rename from src/ipaccess-config.c
rename to openbsc/src/ipaccess-config.c
diff --git a/src/ipaccess-find.c b/openbsc/src/ipaccess-find.c
similarity index 100%
rename from src/ipaccess-find.c
rename to openbsc/src/ipaccess-find.c
diff --git a/src/isdnsync.c b/openbsc/src/isdnsync.c
similarity index 100%
rename from src/isdnsync.c
rename to openbsc/src/isdnsync.c
diff --git a/src/msgb.c b/openbsc/src/msgb.c
similarity index 100%
rename from src/msgb.c
rename to openbsc/src/msgb.c
diff --git a/src/paging.c b/openbsc/src/paging.c
similarity index 100%
rename from src/paging.c
rename to openbsc/src/paging.c
diff --git a/src/rs232.c b/openbsc/src/rs232.c
similarity index 100%
rename from src/rs232.c
rename to openbsc/src/rs232.c
diff --git a/src/select.c b/openbsc/src/select.c
similarity index 100%
rename from src/select.c
rename to openbsc/src/select.c
diff --git a/src/signal.c b/openbsc/src/signal.c
similarity index 100%
rename from src/signal.c
rename to openbsc/src/signal.c
diff --git a/src/subchan_demux.c b/openbsc/src/subchan_demux.c
similarity index 100%
rename from src/subchan_demux.c
rename to openbsc/src/subchan_demux.c
diff --git a/src/telnet_interface.c b/openbsc/src/telnet_interface.c
similarity index 100%
rename from src/telnet_interface.c
rename to openbsc/src/telnet_interface.c
diff --git a/src/timer.c b/openbsc/src/timer.c
similarity index 100%
rename from src/timer.c
rename to openbsc/src/timer.c
diff --git a/src/tlv_parser.c b/openbsc/src/tlv_parser.c
similarity index 100%
rename from src/tlv_parser.c
rename to openbsc/src/tlv_parser.c
diff --git a/src/trau_frame.c b/openbsc/src/trau_frame.c
similarity index 100%
rename from src/trau_frame.c
rename to openbsc/src/trau_frame.c
diff --git a/src/trau_mux.c b/openbsc/src/trau_mux.c
similarity index 100%
rename from src/trau_mux.c
rename to openbsc/src/trau_mux.c
diff --git a/src/vty/buffer.c b/openbsc/src/vty/buffer.c
similarity index 100%
rename from src/vty/buffer.c
rename to openbsc/src/vty/buffer.c
diff --git a/src/vty/cardshell.h b/openbsc/src/vty/cardshell.h
similarity index 100%
rename from src/vty/cardshell.h
rename to openbsc/src/vty/cardshell.h
diff --git a/src/vty/command.c b/openbsc/src/vty/command.c
similarity index 100%
rename from src/vty/command.c
rename to openbsc/src/vty/command.c
diff --git a/src/vty/vector.c b/openbsc/src/vty/vector.c
similarity index 100%
rename from src/vty/vector.c
rename to openbsc/src/vty/vector.c
diff --git a/src/vty/vty.c b/openbsc/src/vty/vty.c
similarity index 100%
rename from src/vty/vty.c
rename to openbsc/src/vty/vty.c
diff --git a/src/vty_interface.c b/openbsc/src/vty_interface.c
similarity index 100%
rename from src/vty_interface.c
rename to openbsc/src/vty_interface.c
diff --git a/tests/Makefile.am b/openbsc/tests/Makefile.am
similarity index 100%
rename from tests/Makefile.am
rename to openbsc/tests/Makefile.am
diff --git a/tests/db/Makefile.am b/openbsc/tests/db/Makefile.am
similarity index 100%
rename from tests/db/Makefile.am
rename to openbsc/tests/db/Makefile.am
diff --git a/tests/db/db_test.c b/openbsc/tests/db/db_test.c
similarity index 100%
rename from tests/db/db_test.c
rename to openbsc/tests/db/db_test.c
diff --git a/tests/debug/Makefile.am b/openbsc/tests/debug/Makefile.am
similarity index 100%
rename from tests/debug/Makefile.am
rename to openbsc/tests/debug/Makefile.am
diff --git a/tests/debug/debug_test.c b/openbsc/tests/debug/debug_test.c
similarity index 100%
rename from tests/debug/debug_test.c
rename to openbsc/tests/debug/debug_test.c
diff --git a/tests/gsm0408/Makefile.am b/openbsc/tests/gsm0408/Makefile.am
similarity index 100%
rename from tests/gsm0408/Makefile.am
rename to openbsc/tests/gsm0408/Makefile.am
diff --git a/tests/gsm0408/gsm0408_test.c b/openbsc/tests/gsm0408/gsm0408_test.c
similarity index 100%
rename from tests/gsm0408/gsm0408_test.c
rename to openbsc/tests/gsm0408/gsm0408_test.c
diff --git a/tests/sms.txt b/openbsc/tests/sms.txt
similarity index 100%
rename from tests/sms.txt
rename to openbsc/tests/sms.txt
diff --git a/tests/sms/Makefile.am b/openbsc/tests/sms/Makefile.am
similarity index 100%
rename from tests/sms/Makefile.am
rename to openbsc/tests/sms/Makefile.am
diff --git a/tests/sms/sms_test.c b/openbsc/tests/sms/sms_test.c
similarity index 100%
rename from tests/sms/sms_test.c
rename to openbsc/tests/sms/sms_test.c
diff --git a/tests/timer/Makefile.am b/openbsc/tests/timer/Makefile.am
similarity index 100%
rename from tests/timer/Makefile.am
rename to openbsc/tests/timer/Makefile.am
diff --git a/tests/timer/timer_test.c b/openbsc/tests/timer/timer_test.c
similarity index 100%
rename from tests/timer/timer_test.c
rename to openbsc/tests/timer/timer_test.c
diff --git a/tools/hlrstat.pl b/openbsc/tools/hlrstat.pl
similarity index 100%
rename from tools/hlrstat.pl
rename to openbsc/tools/hlrstat.pl