diff --git a/upload/README.md b/packages/fkupload/README.md
similarity index 100%
rename from upload/README.md
rename to packages/fkupload/README.md
diff --git a/upload/fkupload/__init__.py b/packages/fkupload/fkupload/__init__.py
similarity index 100%
rename from upload/fkupload/__init__.py
rename to packages/fkupload/fkupload/__init__.py
diff --git a/fkbeta/static/plupload.full.min.js b/packages/fkupload/fkupload/static/plupload.full.min.js
similarity index 100%
rename from fkbeta/static/plupload.full.min.js
rename to packages/fkupload/fkupload/static/plupload.full.min.js
diff --git a/upload/fkupload/static/style.css b/packages/fkupload/fkupload/static/style.css
similarity index 100%
rename from upload/fkupload/static/style.css
rename to packages/fkupload/fkupload/static/style.css
diff --git a/upload/fkupload/templates/layout.html b/packages/fkupload/fkupload/templates/layout.html
similarity index 100%
rename from upload/fkupload/templates/layout.html
rename to packages/fkupload/fkupload/templates/layout.html
diff --git a/upload/fkupload/templates/upload.html b/packages/fkupload/fkupload/templates/upload.html
similarity index 100%
rename from upload/fkupload/templates/upload.html
rename to packages/fkupload/fkupload/templates/upload.html
diff --git a/upload/fkupload/utils.py b/packages/fkupload/fkupload/utils.py
similarity index 100%
rename from upload/fkupload/utils.py
rename to packages/fkupload/fkupload/utils.py
diff --git a/upload/fkupload/views.py b/packages/fkupload/fkupload/views.py
similarity index 100%
rename from upload/fkupload/views.py
rename to packages/fkupload/fkupload/views.py
diff --git a/upload/requirements.txt b/packages/fkupload/requirements.txt
similarity index 100%
rename from upload/requirements.txt
rename to packages/fkupload/requirements.txt
diff --git a/upload/test-fkupload b/packages/fkupload/test-fkupload
similarity index 100%
rename from upload/test-fkupload
rename to packages/fkupload/test-fkupload
diff --git a/Dockerfile b/packages/fkweb/Dockerfile
similarity index 100%
rename from Dockerfile
rename to packages/fkweb/Dockerfile
diff --git a/README.md b/packages/fkweb/README.md
similarity index 100%
rename from README.md
rename to packages/fkweb/README.md
diff --git a/fkbeta/agenda/__init__.py b/packages/fkweb/agenda/__init__.py
similarity index 100%
rename from fkbeta/agenda/__init__.py
rename to packages/fkweb/agenda/__init__.py
diff --git a/fkbeta/agenda/management/__init__.py b/packages/fkweb/agenda/management/__init__.py
similarity index 100%
rename from fkbeta/agenda/management/__init__.py
rename to packages/fkweb/agenda/management/__init__.py
diff --git a/fkbeta/agenda/management/commands/__init__.py b/packages/fkweb/agenda/management/commands/__init__.py
similarity index 100%
rename from fkbeta/agenda/management/commands/__init__.py
rename to packages/fkweb/agenda/management/commands/__init__.py
diff --git a/fkbeta/agenda/management/commands/fill_next_weeks_agenda.py b/packages/fkweb/agenda/management/commands/fill_next_weeks_agenda.py
similarity index 100%
rename from fkbeta/agenda/management/commands/fill_next_weeks_agenda.py
rename to packages/fkweb/agenda/management/commands/fill_next_weeks_agenda.py
diff --git a/fkbeta/agenda/static/background-white.jpg b/packages/fkweb/agenda/static/background-white.jpg
similarity index 100%
rename from fkbeta/agenda/static/background-white.jpg
rename to packages/fkweb/agenda/static/background-white.jpg
diff --git a/fkbeta/agenda/static/background.jpg b/packages/fkweb/agenda/static/background.jpg
similarity index 100%
rename from fkbeta/agenda/static/background.jpg
rename to packages/fkweb/agenda/static/background.jpg
diff --git a/fkbeta/agenda/static/default_large_thumbnail.png b/packages/fkweb/agenda/static/default_large_thumbnail.png
similarity index 100%
rename from fkbeta/agenda/static/default_large_thumbnail.png
rename to packages/fkweb/agenda/static/default_large_thumbnail.png
diff --git a/fkbeta/agenda/static/default_medium_thumbnail.png b/packages/fkweb/agenda/static/default_medium_thumbnail.png
similarity index 100%
rename from fkbeta/agenda/static/default_medium_thumbnail.png
rename to packages/fkweb/agenda/static/default_medium_thumbnail.png
diff --git a/fkbeta/agenda/static/default_small_thumbnail.png b/packages/fkweb/agenda/static/default_small_thumbnail.png
similarity index 100%
rename from fkbeta/agenda/static/default_small_thumbnail.png
rename to packages/fkweb/agenda/static/default_small_thumbnail.png
diff --git a/fkbeta/agenda/static/frikanalen.png b/packages/fkweb/agenda/static/frikanalen.png
similarity index 100%
rename from fkbeta/agenda/static/frikanalen.png
rename to packages/fkweb/agenda/static/frikanalen.png
diff --git a/fkbeta/agenda/static/tono-logo.gif b/packages/fkweb/agenda/static/tono-logo.gif
similarity index 100%
rename from fkbeta/agenda/static/tono-logo.gif
rename to packages/fkweb/agenda/static/tono-logo.gif
diff --git a/fkbeta/agenda/urls.py b/packages/fkweb/agenda/urls.py
similarity index 100%
rename from fkbeta/agenda/urls.py
rename to packages/fkweb/agenda/urls.py
diff --git a/fkbeta/agenda/views.py b/packages/fkweb/agenda/views.py
similarity index 100%
rename from fkbeta/agenda/views.py
rename to packages/fkweb/agenda/views.py
diff --git a/fkbeta/create/__init__.py b/packages/fkweb/create/__init__.py
similarity index 100%
rename from fkbeta/create/__init__.py
rename to packages/fkweb/create/__init__.py
diff --git a/fkbeta/create/admin.py b/packages/fkweb/create/admin.py
similarity index 100%
rename from fkbeta/create/admin.py
rename to packages/fkweb/create/admin.py
diff --git a/fkbeta/create/apps.py b/packages/fkweb/create/apps.py
similarity index 100%
rename from fkbeta/create/apps.py
rename to packages/fkweb/create/apps.py
diff --git a/fkbeta/create/models.py b/packages/fkweb/create/models.py
similarity index 100%
rename from fkbeta/create/models.py
rename to packages/fkweb/create/models.py
diff --git a/fkbeta/create/tests.py b/packages/fkweb/create/tests.py
similarity index 100%
rename from fkbeta/create/tests.py
rename to packages/fkweb/create/tests.py
diff --git a/fkbeta/create/urls.py b/packages/fkweb/create/urls.py
similarity index 100%
rename from fkbeta/create/urls.py
rename to packages/fkweb/create/urls.py
diff --git a/fkbeta/create/views.py b/packages/fkweb/create/views.py
similarity index 100%
rename from fkbeta/create/views.py
rename to packages/fkweb/create/views.py
diff --git a/fkbeta/fk/__init__.py b/packages/fkweb/fk/__init__.py
similarity index 100%
rename from fkbeta/fk/__init__.py
rename to packages/fkweb/fk/__init__.py
diff --git a/fkbeta/fk/admin.py b/packages/fkweb/fk/admin.py
similarity index 100%
rename from fkbeta/fk/admin.py
rename to packages/fkweb/fk/admin.py
diff --git a/fkbeta/fk/fixtures/frikanalen.json b/packages/fkweb/fk/fixtures/frikanalen.json
similarity index 100%
rename from fkbeta/fk/fixtures/frikanalen.json
rename to packages/fkweb/fk/fixtures/frikanalen.json
diff --git a/fkbeta/fk/fixtures/test.yaml b/packages/fkweb/fk/fixtures/test.yaml
similarity index 100%
rename from fkbeta/fk/fixtures/test.yaml
rename to packages/fkweb/fk/fixtures/test.yaml
diff --git a/fkbeta/fk/forms.py b/packages/fkweb/fk/forms.py
similarity index 100%
rename from fkbeta/fk/forms.py
rename to packages/fkweb/fk/forms.py
diff --git a/fkbeta/fk/migrations/0001_initial.py b/packages/fkweb/fk/migrations/0001_initial.py
similarity index 100%
rename from fkbeta/fk/migrations/0001_initial.py
rename to packages/fkweb/fk/migrations/0001_initial.py
diff --git a/fkbeta/fk/migrations/0002_organization_homepage.py b/packages/fkweb/fk/migrations/0002_organization_homepage.py
similarity index 100%
rename from fkbeta/fk/migrations/0002_organization_homepage.py
rename to packages/fkweb/fk/migrations/0002_organization_homepage.py
diff --git a/fkbeta/fk/migrations/0003_is_filler_explained.py b/packages/fkweb/fk/migrations/0003_is_filler_explained.py
similarity index 100%
rename from fkbeta/fk/migrations/0003_is_filler_explained.py
rename to packages/fkweb/fk/migrations/0003_is_filler_explained.py
diff --git a/fkbeta/fk/migrations/0004_is_filler_explained.py b/packages/fkweb/fk/migrations/0004_is_filler_explained.py
similarity index 100%
rename from fkbeta/fk/migrations/0004_is_filler_explained.py
rename to packages/fkweb/fk/migrations/0004_is_filler_explained.py
diff --git a/fkbeta/fk/migrations/0005_remove_duration_old.py b/packages/fkweb/fk/migrations/0005_remove_duration_old.py
similarity index 100%
rename from fkbeta/fk/migrations/0005_remove_duration_old.py
rename to packages/fkweb/fk/migrations/0005_remove_duration_old.py
diff --git a/fkbeta/fk/migrations/0006_videofile_loudness.py b/packages/fkweb/fk/migrations/0006_videofile_loudness.py
similarity index 100%
rename from fkbeta/fk/migrations/0006_videofile_loudness.py
rename to packages/fkweb/fk/migrations/0006_videofile_loudness.py
diff --git a/fkbeta/fk/migrations/0007_videofiles_mimetype.py b/packages/fkweb/fk/migrations/0007_videofiles_mimetype.py
similarity index 100%
rename from fkbeta/fk/migrations/0007_videofiles_mimetype.py
rename to packages/fkweb/fk/migrations/0007_videofiles_mimetype.py
diff --git a/fkbeta/fk/migrations/__init__.py b/packages/fkweb/fk/migrations/__init__.py
similarity index 100%
rename from fkbeta/fk/migrations/__init__.py
rename to packages/fkweb/fk/migrations/__init__.py
diff --git a/fkbeta/fk/models.py b/packages/fkweb/fk/models.py
similarity index 100%
rename from fkbeta/fk/models.py
rename to packages/fkweb/fk/models.py
diff --git a/fkbeta/fk/templates/fk/member_organizations_list.html b/packages/fkweb/fk/templates/fk/member_organizations_list.html
similarity index 100%
rename from fkbeta/fk/templates/fk/member_organizations_list.html
rename to packages/fkweb/fk/templates/fk/member_organizations_list.html
diff --git a/fkbeta/fk/templates/fk/profile.html b/packages/fkweb/fk/templates/fk/profile.html
similarity index 100%
rename from fkbeta/fk/templates/fk/profile.html
rename to packages/fkweb/fk/templates/fk/profile.html
diff --git a/fkbeta/fk/templatetags/__init__.py b/packages/fkweb/fk/templatetags/__init__.py
similarity index 100%
rename from fkbeta/fk/templatetags/__init__.py
rename to packages/fkweb/fk/templatetags/__init__.py
diff --git a/fkbeta/fk/templatetags/fk_utils.py b/packages/fkweb/fk/templatetags/fk_utils.py
similarity index 100%
rename from fkbeta/fk/templatetags/fk_utils.py
rename to packages/fkweb/fk/templatetags/fk_utils.py
diff --git a/fkbeta/fk/templatetags/vod.py b/packages/fkweb/fk/templatetags/vod.py
similarity index 100%
rename from fkbeta/fk/templatetags/vod.py
rename to packages/fkweb/fk/templatetags/vod.py
diff --git a/fkbeta/fk/tests.py b/packages/fkweb/fk/tests.py
similarity index 100%
rename from fkbeta/fk/tests.py
rename to packages/fkweb/fk/tests.py
diff --git a/fkbeta/fk/urls.py b/packages/fkweb/fk/urls.py
similarity index 100%
rename from fkbeta/fk/urls.py
rename to packages/fkweb/fk/urls.py
diff --git a/fkbeta/fk/views.py b/packages/fkweb/fk/views.py
similarity index 100%
rename from fkbeta/fk/views.py
rename to packages/fkweb/fk/views.py
diff --git a/fkbeta/fkbeta/__init__.py b/packages/fkweb/fkbeta/__init__.py
similarity index 100%
rename from fkbeta/fkbeta/__init__.py
rename to packages/fkweb/fkbeta/__init__.py
diff --git a/fkbeta/fkbeta/apps.py b/packages/fkweb/fkbeta/apps.py
similarity index 100%
rename from fkbeta/fkbeta/apps.py
rename to packages/fkweb/fkbeta/apps.py
diff --git a/fkbeta/fkbeta/middleware.py b/packages/fkweb/fkbeta/middleware.py
similarity index 100%
rename from fkbeta/fkbeta/middleware.py
rename to packages/fkweb/fkbeta/middleware.py
diff --git a/fkbeta/fkbeta/settings/__init__.py b/packages/fkweb/fkbeta/settings/__init__.py
similarity index 100%
rename from fkbeta/fkbeta/settings/__init__.py
rename to packages/fkweb/fkbeta/settings/__init__.py
diff --git a/fkbeta/fkbeta/settings/base.py b/packages/fkweb/fkbeta/settings/base.py
similarity index 100%
rename from fkbeta/fkbeta/settings/base.py
rename to packages/fkweb/fkbeta/settings/base.py
diff --git a/fkbeta/fkbeta/settings/local.py b/packages/fkweb/fkbeta/settings/local.py
similarity index 100%
rename from fkbeta/fkbeta/settings/local.py
rename to packages/fkweb/fkbeta/settings/local.py
diff --git a/fkbeta/fkbeta/settings/production.py b/packages/fkweb/fkbeta/settings/production.py
similarity index 100%
rename from fkbeta/fkbeta/settings/production.py
rename to packages/fkweb/fkbeta/settings/production.py
diff --git a/fkbeta/fkbeta/settings/test.py b/packages/fkweb/fkbeta/settings/test.py
similarity index 100%
rename from fkbeta/fkbeta/settings/test.py
rename to packages/fkweb/fkbeta/settings/test.py
diff --git a/fkbeta/fkbeta/signals.py b/packages/fkweb/fkbeta/signals.py
similarity index 100%
rename from fkbeta/fkbeta/signals.py
rename to packages/fkweb/fkbeta/signals.py
diff --git a/fkbeta/fkbeta/urls.py b/packages/fkweb/fkbeta/urls.py
similarity index 100%
rename from fkbeta/fkbeta/urls.py
rename to packages/fkweb/fkbeta/urls.py
diff --git a/fkbeta/fkbeta/views.py b/packages/fkweb/fkbeta/views.py
similarity index 100%
rename from fkbeta/fkbeta/views.py
rename to packages/fkweb/fkbeta/views.py
diff --git a/fkbeta/fkbeta/wsgi.py b/packages/fkweb/fkbeta/wsgi.py
similarity index 100%
rename from fkbeta/fkbeta/wsgi.py
rename to packages/fkweb/fkbeta/wsgi.py
diff --git a/fkbeta/fkutils/__init__.py b/packages/fkweb/fkutils/__init__.py
similarity index 100%
rename from fkbeta/fkutils/__init__.py
rename to packages/fkweb/fkutils/__init__.py
diff --git a/fkbeta/fkutils/timeutils.py b/packages/fkweb/fkutils/timeutils.py
similarity index 100%
rename from fkbeta/fkutils/timeutils.py
rename to packages/fkweb/fkutils/timeutils.py
diff --git a/fkbeta/fkvod/__init__.py b/packages/fkweb/fkvod/__init__.py
similarity index 100%
rename from fkbeta/fkvod/__init__.py
rename to packages/fkweb/fkvod/__init__.py
diff --git a/fkbeta/fkvod/search.py b/packages/fkweb/fkvod/search.py
similarity index 100%
rename from fkbeta/fkvod/search.py
rename to packages/fkweb/fkvod/search.py
diff --git a/fkbeta/fkvod/tests.py b/packages/fkweb/fkvod/tests.py
similarity index 100%
rename from fkbeta/fkvod/tests.py
rename to packages/fkweb/fkvod/tests.py
diff --git a/fkbeta/fkvod/urls.py b/packages/fkweb/fkvod/urls.py
similarity index 100%
rename from fkbeta/fkvod/urls.py
rename to packages/fkweb/fkvod/urls.py
diff --git a/fkbeta/fkvod/views.py b/packages/fkweb/fkvod/views.py
similarity index 100%
rename from fkbeta/fkvod/views.py
rename to packages/fkweb/fkvod/views.py
diff --git a/fkbeta/fkws/__init__.py b/packages/fkweb/fkws/__init__.py
similarity index 100%
rename from fkbeta/fkws/__init__.py
rename to packages/fkweb/fkws/__init__.py
diff --git a/fkbeta/fkws/permissions.py b/packages/fkweb/fkws/permissions.py
similarity index 100%
rename from fkbeta/fkws/permissions.py
rename to packages/fkweb/fkws/permissions.py
diff --git a/fkbeta/fkws/serializers.py b/packages/fkweb/fkws/serializers.py
similarity index 100%
rename from fkbeta/fkws/serializers.py
rename to packages/fkweb/fkws/serializers.py
diff --git a/fkbeta/fkws/tests.py b/packages/fkweb/fkws/tests.py
similarity index 100%
rename from fkbeta/fkws/tests.py
rename to packages/fkweb/fkws/tests.py
diff --git a/fkbeta/fkws/urls.py b/packages/fkweb/fkws/urls.py
similarity index 100%
rename from fkbeta/fkws/urls.py
rename to packages/fkweb/fkws/urls.py
diff --git a/fkbeta/fkws/views.py b/packages/fkweb/fkws/views.py
similarity index 100%
rename from fkbeta/fkws/views.py
rename to packages/fkweb/fkws/views.py
diff --git a/install-debian-deps.sh b/packages/fkweb/install-debian-deps.sh
similarity index 100%
rename from install-debian-deps.sh
rename to packages/fkweb/install-debian-deps.sh
diff --git a/fkbeta/manage.py b/packages/fkweb/manage.py
similarity index 100%
rename from fkbeta/manage.py
rename to packages/fkweb/manage.py
diff --git a/requirements-dev.txt b/packages/fkweb/requirements-dev.txt
similarity index 100%
rename from requirements-dev.txt
rename to packages/fkweb/requirements-dev.txt
diff --git a/requirements.txt b/packages/fkweb/requirements.txt
similarity index 100%
rename from requirements.txt
rename to packages/fkweb/requirements.txt
diff --git a/fkbeta/static/frikanalen-favicon.png b/packages/fkweb/static/frikanalen-favicon.png
similarity index 100%
rename from fkbeta/static/frikanalen-favicon.png
rename to packages/fkweb/static/frikanalen-favicon.png
diff --git a/fkbeta/static/frikanalen-favicon.xcf b/packages/fkweb/static/frikanalen-favicon.xcf
similarity index 100%
rename from fkbeta/static/frikanalen-favicon.xcf
rename to packages/fkweb/static/frikanalen-favicon.xcf
diff --git a/fkbeta/static/frikanalen-stream.m3u b/packages/fkweb/static/frikanalen-stream.m3u
similarity index 100%
rename from fkbeta/static/frikanalen-stream.m3u
rename to packages/fkweb/static/frikanalen-stream.m3u
diff --git a/fkbeta/static/jquery-1.9.1.min.js b/packages/fkweb/static/jquery-1.9.1.min.js
similarity index 100%
rename from fkbeta/static/jquery-1.9.1.min.js
rename to packages/fkweb/static/jquery-1.9.1.min.js
diff --git a/fkbeta/static/knockout-2.2.1.js b/packages/fkweb/static/knockout-2.2.1.js
similarity index 100%
rename from fkbeta/static/knockout-2.2.1.js
rename to packages/fkweb/static/knockout-2.2.1.js
diff --git a/fkbeta/static/knockout.mapping.js b/packages/fkweb/static/knockout.mapping.js
similarity index 100%
rename from fkbeta/static/knockout.mapping.js
rename to packages/fkweb/static/knockout.mapping.js
diff --git a/fkbeta/static/moment.min.js b/packages/fkweb/static/moment.min.js
similarity index 100%
rename from fkbeta/static/moment.min.js
rename to packages/fkweb/static/moment.min.js
diff --git a/upload/fkupload/static/plupload.full.min.js b/packages/fkweb/static/plupload.full.min.js
similarity index 100%
rename from upload/fkupload/static/plupload.full.min.js
rename to packages/fkweb/static/plupload.full.min.js
diff --git a/fkbeta/static/react-0.13.1/JSXTransformer.js b/packages/fkweb/static/react-0.13.1/JSXTransformer.js
similarity index 100%
rename from fkbeta/static/react-0.13.1/JSXTransformer.js
rename to packages/fkweb/static/react-0.13.1/JSXTransformer.js
diff --git a/fkbeta/static/react-0.13.1/Makefile b/packages/fkweb/static/react-0.13.1/Makefile
similarity index 100%
rename from fkbeta/static/react-0.13.1/Makefile
rename to packages/fkweb/static/react-0.13.1/Makefile
diff --git a/fkbeta/static/react-0.13.1/react-with-addons.js b/packages/fkweb/static/react-0.13.1/react-with-addons.js
similarity index 100%
rename from fkbeta/static/react-0.13.1/react-with-addons.js
rename to packages/fkweb/static/react-0.13.1/react-with-addons.js
diff --git a/fkbeta/static/vod.css b/packages/fkweb/static/vod.css
similarity index 100%
rename from fkbeta/static/vod.css
rename to packages/fkweb/static/vod.css
diff --git a/fkbeta/templates/404.html b/packages/fkweb/templates/404.html
similarity index 100%
rename from fkbeta/templates/404.html
rename to packages/fkweb/templates/404.html
diff --git a/fkbeta/templates/500.html b/packages/fkweb/templates/500.html
similarity index 100%
rename from fkbeta/templates/500.html
rename to packages/fkweb/templates/500.html
diff --git a/fkbeta/templates/agenda/calendar.html b/packages/fkweb/templates/agenda/calendar.html
similarity index 100%
rename from fkbeta/templates/agenda/calendar.html
rename to packages/fkweb/templates/agenda/calendar.html
diff --git a/fkbeta/templates/agenda/events.html b/packages/fkweb/templates/agenda/events.html
similarity index 100%
rename from fkbeta/templates/agenda/events.html
rename to packages/fkweb/templates/agenda/events.html
diff --git a/fkbeta/templates/agenda/manage_video_list.html b/packages/fkweb/templates/agenda/manage_video_list.html
similarity index 100%
rename from fkbeta/templates/agenda/manage_video_list.html
rename to packages/fkweb/templates/agenda/manage_video_list.html
diff --git a/fkbeta/templates/agenda/manage_video_new.html b/packages/fkweb/templates/agenda/manage_video_new.html
similarity index 100%
rename from fkbeta/templates/agenda/manage_video_new.html
rename to packages/fkweb/templates/agenda/manage_video_new.html
diff --git a/fkbeta/templates/agenda/planner.html b/packages/fkweb/templates/agenda/planner.html
similarity index 100%
rename from fkbeta/templates/agenda/planner.html
rename to packages/fkweb/templates/agenda/planner.html
diff --git a/fkbeta/templates/agenda/xmltv.xml b/packages/fkweb/templates/agenda/xmltv.xml
similarity index 100%
rename from fkbeta/templates/agenda/xmltv.xml
rename to packages/fkweb/templates/agenda/xmltv.xml
diff --git a/fkbeta/templates/agenda/xmltv_home.html b/packages/fkweb/templates/agenda/xmltv_home.html
similarity index 100%
rename from fkbeta/templates/agenda/xmltv_home.html
rename to packages/fkweb/templates/agenda/xmltv_home.html
diff --git a/fkbeta/templates/base_generic.html b/packages/fkweb/templates/base_generic.html
similarity index 100%
rename from fkbeta/templates/base_generic.html
rename to packages/fkweb/templates/base_generic.html
diff --git a/fkbeta/templates/create/home.html b/packages/fkweb/templates/create/home.html
similarity index 100%
rename from fkbeta/templates/create/home.html
rename to packages/fkweb/templates/create/home.html
diff --git a/fkbeta/templates/fkvod/category_list.html b/packages/fkweb/templates/fkvod/category_list.html
similarity index 100%
rename from fkbeta/templates/fkvod/category_list.html
rename to packages/fkweb/templates/fkvod/category_list.html
diff --git a/fkbeta/templates/fkvod/video_details.html b/packages/fkweb/templates/fkvod/video_details.html
similarity index 100%
rename from fkbeta/templates/fkvod/video_details.html
rename to packages/fkweb/templates/fkvod/video_details.html
diff --git a/fkbeta/templates/fkvod/video_list.html b/packages/fkweb/templates/fkvod/video_list.html
similarity index 100%
rename from fkbeta/templates/fkvod/video_list.html
rename to packages/fkweb/templates/fkvod/video_list.html
diff --git a/fkbeta/templates/fkvod/video_list.rss b/packages/fkweb/templates/fkvod/video_list.rss
similarity index 100%
rename from fkbeta/templates/fkvod/video_list.rss
rename to packages/fkweb/templates/fkvod/video_list.rss
diff --git a/fkbeta/templates/fkvod/vod_widget.html b/packages/fkweb/templates/fkvod/vod_widget.html
similarity index 100%
rename from fkbeta/templates/fkvod/vod_widget.html
rename to packages/fkweb/templates/fkvod/vod_widget.html
diff --git a/fkbeta/templates/frontpage.html b/packages/fkweb/templates/frontpage.html
similarity index 100%
rename from fkbeta/templates/frontpage.html
rename to packages/fkweb/templates/frontpage.html
diff --git a/fkbeta/templates/registration/login.html b/packages/fkweb/templates/registration/login.html
similarity index 100%
rename from fkbeta/templates/registration/login.html
rename to packages/fkweb/templates/registration/login.html
diff --git a/fkbeta/templates/registration/register.html b/packages/fkweb/templates/registration/register.html
similarity index 100%
rename from fkbeta/templates/registration/register.html
rename to packages/fkweb/templates/registration/register.html
diff --git a/nagios-plugin/check_video_stream_images b/packages/nagios-check-video-stream/check_video_stream_images
similarity index 100%
rename from nagios-plugin/check_video_stream_images
rename to packages/nagios-check-video-stream/check_video_stream_images
diff --git a/utils/generate-video-files b/packages/utils/generate-video-files
similarity index 100%
rename from utils/generate-video-files
rename to packages/utils/generate-video-files
diff --git a/utils/move_and_process.py b/packages/utils/move_and_process.py
similarity index 100%
rename from utils/move_and_process.py
rename to packages/utils/move_and_process.py
diff --git a/utils/obe-service/README b/packages/utils/obe-service/README
similarity index 100%
rename from utils/obe-service/README
rename to packages/utils/obe-service/README
diff --git a/utils/obe-service/fk-obe b/packages/utils/obe-service/fk-obe
similarity index 100%
rename from utils/obe-service/fk-obe
rename to packages/utils/obe-service/fk-obe
diff --git a/utils/obe-service/fk-obe.conf b/packages/utils/obe-service/fk-obe.conf
similarity index 100%
rename from utils/obe-service/fk-obe.conf
rename to packages/utils/obe-service/fk-obe.conf
diff --git a/utils/obe-service/fk-obe.service b/packages/utils/obe-service/fk-obe.service
similarity index 100%
rename from utils/obe-service/fk-obe.service
rename to packages/utils/obe-service/fk-obe.service
diff --git a/utils/process-uploads b/packages/utils/process-uploads
similarity index 100%
rename from utils/process-uploads
rename to packages/utils/process-uploads
diff --git a/utils/run-move_and_process b/packages/utils/run-move_and_process
similarity index 100%
rename from utils/run-move_and_process
rename to packages/utils/run-move_and_process
diff --git a/utils/stream-multicast/fk-stream-multicast b/packages/utils/stream-multicast/fk-stream-multicast
similarity index 100%
rename from utils/stream-multicast/fk-stream-multicast
rename to packages/utils/stream-multicast/fk-stream-multicast
diff --git a/utils/stream-multicast/fk-stream-multicast.service b/packages/utils/stream-multicast/fk-stream-multicast.service
similarity index 100%
rename from utils/stream-multicast/fk-stream-multicast.service
rename to packages/utils/stream-multicast/fk-stream-multicast.service
diff --git a/utils/stream-webm/README b/packages/utils/stream-webm/README
similarity index 100%
rename from utils/stream-webm/README
rename to packages/utils/stream-webm/README
diff --git a/utils/stream-webm/fk-stream-webm b/packages/utils/stream-webm/fk-stream-webm
similarity index 100%
rename from utils/stream-webm/fk-stream-webm
rename to packages/utils/stream-webm/fk-stream-webm
diff --git a/utils/stream-webm/fk-stream-webm.service b/packages/utils/stream-webm/fk-stream-webm.service
similarity index 100%
rename from utils/stream-webm/fk-stream-webm.service
rename to packages/utils/stream-webm/fk-stream-webm.service
diff --git a/utils/test_move_and_process.py b/packages/utils/test_move_and_process.py
similarity index 100%
rename from utils/test_move_and_process.py
rename to packages/utils/test_move_and_process.py
diff --git a/utils/test_videos_generator/mktestvid b/packages/utils/test_videos_generator/mktestvid
similarity index 100%
rename from utils/test_videos_generator/mktestvid
rename to packages/utils/test_videos_generator/mktestvid
diff --git a/utils/videofiles-update b/packages/utils/videofiles-update
similarity index 100%
rename from utils/videofiles-update
rename to packages/utils/videofiles-update
diff --git a/testdata/sine.wav b/tests/data/sine.wav
similarity index 100%
rename from testdata/sine.wav
rename to tests/data/sine.wav
diff --git a/testdata/white-sine.ogv b/tests/data/white-sine.ogv
similarity index 100%
rename from testdata/white-sine.ogv
rename to tests/data/white-sine.ogv
diff --git a/testdata/white.png b/tests/data/white.png
similarity index 100%
rename from testdata/white.png
rename to tests/data/white.png