diff --git a/ui/MANIFEST.in b/ui/MANIFEST.in
new file mode 100644
index 0000000..598e850
--- /dev/null
+++ b/ui/MANIFEST.in
@@ -0,0 +1,2 @@
+recursive-include homemanager *
+recursive-include templates *
\ No newline at end of file
diff --git a/ui/homemanager/settings.py b/ui/homemanager/settings.py
index be0edb0..cc82f2d 100644
--- a/ui/homemanager/settings.py
+++ b/ui/homemanager/settings.py
@@ -55,7 +55,7 @@ ROOT_URLCONF = 'homemanager.urls'
 TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [BASE_DIR / 'templates'],
+        'DIRS': [BASE_DIR / 'main' / 'templates'],
         'APP_DIRS': True,
         'OPTIONS': {
             'context_processors': [
diff --git a/ui/templates/base.html b/ui/main/templates/base.html
similarity index 100%
rename from ui/templates/base.html
rename to ui/main/templates/base.html
diff --git a/ui/templates/registration/login.html b/ui/main/templates/registration/login.html
similarity index 100%
rename from ui/templates/registration/login.html
rename to ui/main/templates/registration/login.html
diff --git a/ui/setup.py b/ui/setup.py
index f5e7843..2278f4e 100644
--- a/ui/setup.py
+++ b/ui/setup.py
@@ -1,4 +1,4 @@
-from distutils.core import setup
+from distutils.core import setup, find_packages
 from glob import glob
 
 setup(name='homemanager',
@@ -7,7 +7,5 @@ setup(name='homemanager',
     author='Alejandro Diaz',
     author_email='al.diaz@estudiantec.cr',
     packages=['homemanager', 'main'],
-    data_files = [
-        ('templates', glob('templates/**/*', recursive=True))
-    ]
+    zip_safe=False,
 )
\ No newline at end of file