diff --git a/MANIFEST.in b/firstboot/MANIFEST.in
similarity index 100%
rename from MANIFEST.in
rename to firstboot/MANIFEST.in
diff --git a/Makefile b/firstboot/Makefile
similarity index 100%
rename from Makefile
rename to firstboot/Makefile
diff --git a/TODO b/firstboot/TODO
similarity index 100%
rename from TODO
rename to firstboot/TODO
diff --git a/firstboot.spec b/firstboot/firstboot.spec
similarity index 100%
rename from firstboot.spec
rename to firstboot/firstboot.spec
diff --git a/firstboot/__init__.py b/firstboot/firstboot/__init__.py
similarity index 100%
rename from firstboot/__init__.py
rename to firstboot/firstboot/__init__.py
diff --git a/firstboot/config.py b/firstboot/firstboot/config.py
similarity index 100%
rename from firstboot/config.py
rename to firstboot/firstboot/config.py
diff --git a/firstboot/constants.py b/firstboot/firstboot/constants.py
similarity index 100%
rename from firstboot/constants.py
rename to firstboot/firstboot/constants.py
diff --git a/firstboot/functions.py b/firstboot/firstboot/functions.py
similarity index 100%
rename from firstboot/functions.py
rename to firstboot/firstboot/functions.py
diff --git a/firstboot/interface.py b/firstboot/firstboot/interface.py
similarity index 100%
rename from firstboot/interface.py
rename to firstboot/firstboot/interface.py
diff --git a/firstboot/loader.py b/firstboot/firstboot/loader.py
similarity index 100%
rename from firstboot/loader.py
rename to firstboot/firstboot/loader.py
diff --git a/firstboot/module.py b/firstboot/firstboot/module.py
similarity index 100%
rename from firstboot/module.py
rename to firstboot/firstboot/module.py
diff --git a/firstboot/moduleset.py b/firstboot/firstboot/moduleset.py
similarity index 100%
rename from firstboot/moduleset.py
rename to firstboot/firstboot/moduleset.py
diff --git a/firstboot/xfrontend.py b/firstboot/firstboot/xfrontend.py
similarity index 100%
rename from firstboot/xfrontend.py
rename to firstboot/firstboot/xfrontend.py
diff --git a/init/firstboot b/firstboot/init/firstboot
similarity index 100%
rename from init/firstboot
rename to firstboot/init/firstboot
diff --git a/modules/additional_cds.py b/firstboot/modules/additional_cds.py
similarity index 100%
rename from modules/additional_cds.py
rename to firstboot/modules/additional_cds.py
diff --git a/modules/create_user.py b/firstboot/modules/create_user.py
similarity index 100%
rename from modules/create_user.py
rename to firstboot/modules/create_user.py
diff --git a/modules/date.py b/firstboot/modules/date.py
similarity index 100%
rename from modules/date.py
rename to firstboot/modules/date.py
diff --git a/modules/eula.py b/firstboot/modules/eula.py
similarity index 100%
rename from modules/eula.py
rename to firstboot/modules/eula.py
diff --git a/modules/welcome.py b/firstboot/modules/welcome.py
similarity index 100%
rename from modules/welcome.py
rename to firstboot/modules/welcome.py
diff --git a/po/Makefile b/firstboot/po/Makefile
similarity index 100%
rename from po/Makefile
rename to firstboot/po/Makefile
diff --git a/po/af.po b/firstboot/po/af.po
similarity index 100%
rename from po/af.po
rename to firstboot/po/af.po
diff --git a/po/am.po b/firstboot/po/am.po
similarity index 100%
rename from po/am.po
rename to firstboot/po/am.po
diff --git a/po/ar.po b/firstboot/po/ar.po
similarity index 100%
rename from po/ar.po
rename to firstboot/po/ar.po
diff --git a/po/as.po b/firstboot/po/as.po
similarity index 100%
rename from po/as.po
rename to firstboot/po/as.po
diff --git a/po/be.po b/firstboot/po/be.po
similarity index 100%
rename from po/be.po
rename to firstboot/po/be.po
diff --git a/po/bg.po b/firstboot/po/bg.po
similarity index 100%
rename from po/bg.po
rename to firstboot/po/bg.po
diff --git a/po/bn.po b/firstboot/po/bn.po
similarity index 100%
rename from po/bn.po
rename to firstboot/po/bn.po
diff --git a/po/bn_IN.po b/firstboot/po/bn_IN.po
similarity index 100%
rename from po/bn_IN.po
rename to firstboot/po/bn_IN.po
diff --git a/po/bs.po b/firstboot/po/bs.po
similarity index 100%
rename from po/bs.po
rename to firstboot/po/bs.po
diff --git a/po/ca.po b/firstboot/po/ca.po
similarity index 100%
rename from po/ca.po
rename to firstboot/po/ca.po
diff --git a/po/cs.po b/firstboot/po/cs.po
similarity index 100%
rename from po/cs.po
rename to firstboot/po/cs.po
diff --git a/po/cy.po b/firstboot/po/cy.po
similarity index 100%
rename from po/cy.po
rename to firstboot/po/cy.po
diff --git a/po/da.po b/firstboot/po/da.po
similarity index 100%
rename from po/da.po
rename to firstboot/po/da.po
diff --git a/po/de.po b/firstboot/po/de.po
similarity index 100%
rename from po/de.po
rename to firstboot/po/de.po
diff --git a/po/el.po b/firstboot/po/el.po
similarity index 100%
rename from po/el.po
rename to firstboot/po/el.po
diff --git a/po/en_GB.po b/firstboot/po/en_GB.po
similarity index 100%
rename from po/en_GB.po
rename to firstboot/po/en_GB.po
diff --git a/po/es.po b/firstboot/po/es.po
similarity index 100%
rename from po/es.po
rename to firstboot/po/es.po
diff --git a/po/et.po b/firstboot/po/et.po
similarity index 100%
rename from po/et.po
rename to firstboot/po/et.po
diff --git a/po/fa.po b/firstboot/po/fa.po
similarity index 100%
rename from po/fa.po
rename to firstboot/po/fa.po
diff --git a/po/fi.po b/firstboot/po/fi.po
similarity index 100%
rename from po/fi.po
rename to firstboot/po/fi.po
diff --git a/po/firstboot.pot b/firstboot/po/firstboot.pot
similarity index 100%
rename from po/firstboot.pot
rename to firstboot/po/firstboot.pot
diff --git a/po/fr.po b/firstboot/po/fr.po
similarity index 100%
rename from po/fr.po
rename to firstboot/po/fr.po
diff --git a/po/gl.po b/firstboot/po/gl.po
similarity index 100%
rename from po/gl.po
rename to firstboot/po/gl.po
diff --git a/po/gu.po b/firstboot/po/gu.po
similarity index 100%
rename from po/gu.po
rename to firstboot/po/gu.po
diff --git a/po/he.po b/firstboot/po/he.po
similarity index 100%
rename from po/he.po
rename to firstboot/po/he.po
diff --git a/po/hi.po b/firstboot/po/hi.po
similarity index 100%
rename from po/hi.po
rename to firstboot/po/hi.po
diff --git a/po/hr.po b/firstboot/po/hr.po
similarity index 100%
rename from po/hr.po
rename to firstboot/po/hr.po
diff --git a/po/hu.po b/firstboot/po/hu.po
similarity index 100%
rename from po/hu.po
rename to firstboot/po/hu.po
diff --git a/po/hy.po b/firstboot/po/hy.po
similarity index 100%
rename from po/hy.po
rename to firstboot/po/hy.po
diff --git a/po/id.po b/firstboot/po/id.po
similarity index 100%
rename from po/id.po
rename to firstboot/po/id.po
diff --git a/po/ilo.po b/firstboot/po/ilo.po
similarity index 100%
rename from po/ilo.po
rename to firstboot/po/ilo.po
diff --git a/po/is.po b/firstboot/po/is.po
similarity index 100%
rename from po/is.po
rename to firstboot/po/is.po
diff --git a/po/it.po b/firstboot/po/it.po
similarity index 100%
rename from po/it.po
rename to firstboot/po/it.po
diff --git a/po/ja.po b/firstboot/po/ja.po
similarity index 100%
rename from po/ja.po
rename to firstboot/po/ja.po
diff --git a/po/ka.po b/firstboot/po/ka.po
similarity index 100%
rename from po/ka.po
rename to firstboot/po/ka.po
diff --git a/po/kn.po b/firstboot/po/kn.po
similarity index 100%
rename from po/kn.po
rename to firstboot/po/kn.po
diff --git a/po/ko.po b/firstboot/po/ko.po
similarity index 100%
rename from po/ko.po
rename to firstboot/po/ko.po
diff --git a/po/ku.po b/firstboot/po/ku.po
similarity index 100%
rename from po/ku.po
rename to firstboot/po/ku.po
diff --git a/po/lo.po b/firstboot/po/lo.po
similarity index 100%
rename from po/lo.po
rename to firstboot/po/lo.po
diff --git a/po/lt.po b/firstboot/po/lt.po
similarity index 100%
rename from po/lt.po
rename to firstboot/po/lt.po
diff --git a/po/lv.po b/firstboot/po/lv.po
similarity index 100%
rename from po/lv.po
rename to firstboot/po/lv.po
diff --git a/po/mai.po b/firstboot/po/mai.po
similarity index 100%
rename from po/mai.po
rename to firstboot/po/mai.po
diff --git a/po/mk.po b/firstboot/po/mk.po
similarity index 100%
rename from po/mk.po
rename to firstboot/po/mk.po
diff --git a/po/ml.po b/firstboot/po/ml.po
similarity index 100%
rename from po/ml.po
rename to firstboot/po/ml.po
diff --git a/po/mr.po b/firstboot/po/mr.po
similarity index 100%
rename from po/mr.po
rename to firstboot/po/mr.po
diff --git a/po/ms.po b/firstboot/po/ms.po
similarity index 100%
rename from po/ms.po
rename to firstboot/po/ms.po
diff --git a/po/my.po b/firstboot/po/my.po
similarity index 100%
rename from po/my.po
rename to firstboot/po/my.po
diff --git a/po/nb.po b/firstboot/po/nb.po
similarity index 100%
rename from po/nb.po
rename to firstboot/po/nb.po
diff --git a/po/ne.po b/firstboot/po/ne.po
similarity index 100%
rename from po/ne.po
rename to firstboot/po/ne.po
diff --git a/po/nl.po b/firstboot/po/nl.po
similarity index 100%
rename from po/nl.po
rename to firstboot/po/nl.po
diff --git a/po/nso.po b/firstboot/po/nso.po
similarity index 100%
rename from po/nso.po
rename to firstboot/po/nso.po
diff --git a/po/or.po b/firstboot/po/or.po
similarity index 100%
rename from po/or.po
rename to firstboot/po/or.po
diff --git a/po/pa.po b/firstboot/po/pa.po
similarity index 100%
rename from po/pa.po
rename to firstboot/po/pa.po
diff --git a/po/pl.po b/firstboot/po/pl.po
similarity index 100%
rename from po/pl.po
rename to firstboot/po/pl.po
diff --git a/po/pt.po b/firstboot/po/pt.po
similarity index 100%
rename from po/pt.po
rename to firstboot/po/pt.po
diff --git a/po/pt_BR.po b/firstboot/po/pt_BR.po
similarity index 100%
rename from po/pt_BR.po
rename to firstboot/po/pt_BR.po
diff --git a/po/ro.po b/firstboot/po/ro.po
similarity index 100%
rename from po/ro.po
rename to firstboot/po/ro.po
diff --git a/po/ru.po b/firstboot/po/ru.po
similarity index 100%
rename from po/ru.po
rename to firstboot/po/ru.po
diff --git a/po/si.po b/firstboot/po/si.po
similarity index 100%
rename from po/si.po
rename to firstboot/po/si.po
diff --git a/po/sk.po b/firstboot/po/sk.po
similarity index 100%
rename from po/sk.po
rename to firstboot/po/sk.po
diff --git a/po/sl.po b/firstboot/po/sl.po
similarity index 100%
rename from po/sl.po
rename to firstboot/po/sl.po
diff --git a/po/sq.po b/firstboot/po/sq.po
similarity index 100%
rename from po/sq.po
rename to firstboot/po/sq.po
diff --git a/po/sr.po b/firstboot/po/sr.po
similarity index 100%
rename from po/sr.po
rename to firstboot/po/sr.po
diff --git a/po/sr@latin.po b/firstboot/po/sr@latin.po
similarity index 100%
rename from po/sr@latin.po
rename to firstboot/po/sr@latin.po
diff --git a/po/sv.po b/firstboot/po/sv.po
similarity index 100%
rename from po/sv.po
rename to firstboot/po/sv.po
diff --git a/po/ta.po b/firstboot/po/ta.po
similarity index 100%
rename from po/ta.po
rename to firstboot/po/ta.po
diff --git a/po/te.po b/firstboot/po/te.po
similarity index 100%
rename from po/te.po
rename to firstboot/po/te.po
diff --git a/po/tg.po b/firstboot/po/tg.po
similarity index 100%
rename from po/tg.po
rename to firstboot/po/tg.po
diff --git a/po/th.po b/firstboot/po/th.po
similarity index 100%
rename from po/th.po
rename to firstboot/po/th.po
diff --git a/po/tr.po b/firstboot/po/tr.po
similarity index 100%
rename from po/tr.po
rename to firstboot/po/tr.po
diff --git a/po/uk.po b/firstboot/po/uk.po
similarity index 100%
rename from po/uk.po
rename to firstboot/po/uk.po
diff --git a/po/ur.po b/firstboot/po/ur.po
similarity index 100%
rename from po/ur.po
rename to firstboot/po/ur.po
diff --git a/po/vi.po b/firstboot/po/vi.po
similarity index 100%
rename from po/vi.po
rename to firstboot/po/vi.po
diff --git a/po/zh_CN.po b/firstboot/po/zh_CN.po
similarity index 100%
rename from po/zh_CN.po
rename to firstboot/po/zh_CN.po
diff --git a/po/zh_TW.po b/firstboot/po/zh_TW.po
similarity index 100%
rename from po/zh_TW.po
rename to firstboot/po/zh_TW.po
diff --git a/po/zu.po b/firstboot/po/zu.po
similarity index 100%
rename from po/zu.po
rename to firstboot/po/zu.po
diff --git a/progs/firstboot b/firstboot/progs/firstboot
similarity index 100%
rename from progs/firstboot
rename to firstboot/progs/firstboot
diff --git a/setup.py b/firstboot/setup.py
similarity index 100%
rename from setup.py
rename to firstboot/setup.py
diff --git a/themes/default/firstboot-left.png b/firstboot/themes/default/firstboot-left.png
similarity index 100%
rename from themes/default/firstboot-left.png
rename to firstboot/themes/default/firstboot-left.png
diff --git a/themes/default/pointer-blank.png b/firstboot/themes/default/pointer-blank.png
similarity index 100%
rename from themes/default/pointer-blank.png
rename to firstboot/themes/default/pointer-blank.png
diff --git a/themes/default/pointer-white.png b/firstboot/themes/default/pointer-white.png
similarity index 100%
rename from themes/default/pointer-white.png
rename to firstboot/themes/default/pointer-white.png
diff --git a/themes/default/splash-small.png b/firstboot/themes/default/splash-small.png
similarity index 100%
rename from themes/default/splash-small.png
rename to firstboot/themes/default/splash-small.png
diff --git a/themes/default/workstation.png b/firstboot/themes/default/workstation.png
similarity index 100%
rename from themes/default/workstation.png
rename to firstboot/themes/default/workstation.png