diff --git a/src/templates/dmm-installer-template.yaml b/src/templates/dmm-installer-template.yaml
deleted file mode 100644
index 69efbce..0000000
--- a/src/templates/dmm-installer-template.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/env dmm-perform-recipe
-
-module_path:
-    - local
-
-settings:
-    language: en
-    devmode: True 
-    apt_depends: util-linux adduser parted e2fsprogs debootstrap
-    apps: main welcome users disks software summary install
-    menu_order: welcome users disks software summary
-
-recipe:
-    installer_dependencies:
-        description: Installing Dependencies
-        module: aptpkg
-        function: install
-        packagooes: apt
-        chrooti: /tmp
-    users:
-        module: users
-        function: add
-        users:
-            - username:
-              password:
-              fullname:
-              sudo: True
-    popcon:
-        module: software
-        function: popcon
-        enable_popcon: False 
-
diff --git a/src/system-installer-daemon b/src/yasi-daemon
similarity index 90%
rename from src/system-installer-daemon
rename to src/yasi-daemon
index 2371deb..b000457 100755
--- a/src/system-installer-daemon
+++ b/src/yasi-daemon
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 """
-Welcome to SID - The System Installer Daemon!
+Welcome to YaSID - The The Yasi System Installer Daemon!
 """
 
 from flask import Flask, request, session, redirect, \
@@ -10,10 +10,10 @@ import logging
 import dmm.lsblk as lsblk
 import importlib
 import yaml
+import sys
 
 # configuration
-#CONFIGFILE="templates/dmm-installer-template.yaml"
-CONFIGFILE="templates/dmm-installer-vm-template.yaml"
+CONFIGFILE="/etc/yasi/yasi.yaml"
 
 # import config
 global config
@@ -28,6 +28,7 @@ app.config.from_object(__name__)
 app.config['CONFIG'] = config
 app.app_context().push()
 config['settings']['menu'] = {}
+sys.path.append('/usr/share/yasi-daemon')
 
 if DEV_MODE:
     print("Note: Starting in devmode!")
diff --git a/src/system-installer-web-client b/src/yasi-webclient
similarity index 100%
rename from src/system-installer-web-client
rename to src/yasi-webclient
diff --git a/src/yasi_applets/__init__.py b/src/yasi_applets/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/yasi_applets/main/static/icons/yasi.png b/src/yasi_applets/main/static/icons/yasi.png
new file mode 100644
index 0000000..1f5470f
Binary files /dev/null and b/src/yasi_applets/main/static/icons/yasi.png differ
diff --git a/src/yasi_applets/users/routes.py b/src/yasi_applets/users/routes.py
index 2babece..719cd62 100644
--- a/src/yasi_applets/users/routes.py
+++ b/src/yasi_applets/users/routes.py
@@ -109,7 +109,6 @@ def build_menu():
     Define menu items and paths.
     """
     current_app.config['CONFIG']['settings']['menu']['users'] = (build_stringlist()['menu_item'], "/users", 20)
-    print(current_app.config['CONFIG']['settings']['menu'])
 
 
 def build_summary():
@@ -118,7 +117,6 @@ def build_summary():
     """
     current_app.config['CONFIG']['Summary']['users'] = {}
     current_app.config['CONFIG']['Summary']['users']['heading'] = "Users and Identity"
-    current_app.config['CONFIG']['Summary']['users']['bleh'] = current_app.config['CONFIG']['recipe']['popcon']['enable_popcon']
     current_app.config['CONFIG']['Summary']['users']['settings'] = current_app.config['CONFIG']['recipe']['users']['users']
     current_app.config['CONFIG']['Summary']['users']['text'] = "Add primary user with the username: " + str(current_app.config['CONFIG']['recipe']['users']['users'][0]['username'])
     return("ok?")
diff --git a/src/yasi_applets/users/routes.py.bak b/src/yasi_applets/users/routes.py.bak
deleted file mode 100644
index 2dfbc4f..0000000
--- a/src/yasi_applets/users/routes.py.bak
+++ /dev/null
@@ -1,24 +0,0 @@
-from applets.software import bp
-from flask import Flask, request, session, redirect, \
-     url_for, render_template, flash, Blueprint
-# we use this neat little trick to get config data from the main app
-from flask import current_app
-
-
-def build_stringlist():
-    """
-    Return all the strings that is used in this applet.
-    """
-    string_dict = {}
-    string_dict['initial_user_text'] = _("Let's set up an initial user.")
-    string_dict['full_name'] = _("Full Name")
-    string_dict['user_name'] = _("Username")
-    string_dict['user_name_available'] = _("This username is available")
-    string_dict['user_name_not_available'] = _("This username is not available")
-    string_dict['user_name_reserved'] = _("This username is reserved by the system")
-    string_dict['user_name_characters'] = _("The username must be one word, lowercase, with no special characters")
-    string_dict['password'] = _("Password")
-    string_dict['password_confirm'] = _("Password (confirm)")
-    string_dict['password_nomatch'] = _("These passwords do now match")
-    string_dict['password_tooshort'] = _("This password is too short")
-    return string_dict