diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000000000000000000000000000000000000..277fb2252317b05335ed361217ecf7f2b5c2291b
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,2 @@
+recursive-include mo/web/templates *
+recursive-include mo/web/static *
diff --git a/templates/base.html b/mo/web/templates/base.html
similarity index 100%
rename from templates/base.html
rename to mo/web/templates/base.html
diff --git a/templates/login.html b/mo/web/templates/login.html
similarity index 100%
rename from templates/login.html
rename to mo/web/templates/login.html
diff --git a/templates/main.html b/mo/web/templates/main.html
similarity index 100%
rename from templates/main.html
rename to mo/web/templates/main.html
diff --git a/templates/not_implemented.html b/mo/web/templates/not_implemented.html
similarity index 100%
rename from templates/not_implemented.html
rename to mo/web/templates/not_implemented.html
diff --git a/templates/org_contest.html b/mo/web/templates/org_contest.html
similarity index 100%
rename from templates/org_contest.html
rename to mo/web/templates/org_contest.html
diff --git a/templates/org_contest_import.html b/mo/web/templates/org_contest_import.html
similarity index 100%
rename from templates/org_contest_import.html
rename to mo/web/templates/org_contest_import.html
diff --git a/templates/org_contest_import_help.html b/mo/web/templates/org_contest_import_help.html
similarity index 100%
rename from templates/org_contest_import_help.html
rename to mo/web/templates/org_contest_import_help.html
diff --git a/templates/org_contest_list.html b/mo/web/templates/org_contest_list.html
similarity index 100%
rename from templates/org_contest_list.html
rename to mo/web/templates/org_contest_list.html
diff --git a/templates/org_contest_root.html b/mo/web/templates/org_contest_root.html
similarity index 100%
rename from templates/org_contest_root.html
rename to mo/web/templates/org_contest_root.html
diff --git a/templates/org_contest_round.html b/mo/web/templates/org_contest_round.html
similarity index 100%
rename from templates/org_contest_round.html
rename to mo/web/templates/org_contest_round.html
diff --git a/templates/org_index.html b/mo/web/templates/org_index.html
similarity index 100%
rename from templates/org_index.html
rename to mo/web/templates/org_index.html
diff --git a/templates/org_place.html b/mo/web/templates/org_place.html
similarity index 100%
rename from templates/org_place.html
rename to mo/web/templates/org_place.html
diff --git a/templates/org_place_edit.html b/mo/web/templates/org_place_edit.html
similarity index 100%
rename from templates/org_place_edit.html
rename to mo/web/templates/org_place_edit.html
diff --git a/templates/org_place_move.html b/mo/web/templates/org_place_move.html
similarity index 100%
rename from templates/org_place_move.html
rename to mo/web/templates/org_place_move.html
diff --git a/templates/org_place_new.html b/mo/web/templates/org_place_new.html
similarity index 100%
rename from templates/org_place_new.html
rename to mo/web/templates/org_place_new.html
diff --git a/templates/org_place_rights.html b/mo/web/templates/org_place_rights.html
similarity index 100%
rename from templates/org_place_rights.html
rename to mo/web/templates/org_place_rights.html
diff --git a/templates/org_user.html b/mo/web/templates/org_user.html
similarity index 100%
rename from templates/org_user.html
rename to mo/web/templates/org_user.html
diff --git a/templates/org_user_edit.html b/mo/web/templates/org_user_edit.html
similarity index 100%
rename from templates/org_user_edit.html
rename to mo/web/templates/org_user_edit.html
diff --git a/templates/org_user_new.html b/mo/web/templates/org_user_new.html
similarity index 100%
rename from templates/org_user_new.html
rename to mo/web/templates/org_user_new.html
diff --git a/templates/org_users.html b/mo/web/templates/org_users.html
similarity index 100%
rename from templates/org_users.html
rename to mo/web/templates/org_users.html
diff --git a/templates/org_users_orgs.html b/mo/web/templates/org_users_orgs.html
similarity index 100%
rename from templates/org_users_orgs.html
rename to mo/web/templates/org_users_orgs.html
diff --git a/templates/reset.html b/mo/web/templates/reset.html
similarity index 100%
rename from templates/reset.html
rename to mo/web/templates/reset.html
diff --git a/setup.py b/setup.py
index 74fff9cb12a3fb2d507ba20863cdae00157efada..2d776b47ebbd26236288069f953481f19d9065c3 100644
--- a/setup.py
+++ b/setup.py
@@ -6,13 +6,15 @@ setuptools.setup(
     name='osmo',
     version='0.1',
     description='Odevzdávací systém Matematické olympiády',
-    packages=['mo'],
+    packages=['mo', 'mo/web'],
     scripts=[
         'bin/add-role',
         'bin/create-contests',
         'bin/create-round',
         'bin/create-user',
     ],
+    include_package_data=True,
+    zip_safe=False,
     install_requires=[
         # Udržujte prosím seřazené
         'Flask',
diff --git a/templates b/templates
new file mode 120000
index 0000000000000000000000000000000000000000..74bfe38ced0477d2a8992e53cb4532fa21dadd5e
--- /dev/null
+++ b/templates
@@ -0,0 +1 @@
+mo/web/templates
\ No newline at end of file