diff --git a/roots/_states/rsa_key.py b/states/_states/rsa_key.py
similarity index 100%
rename from roots/_states/rsa_key.py
rename to states/_states/rsa_key.py
diff --git a/roots/_states/x509_certificate.py b/states/_states/x509_certificate.py
similarity index 100%
rename from roots/_states/x509_certificate.py
rename to states/_states/x509_certificate.py
diff --git a/roots/base/bash_functions b/states/base/bash_functions
similarity index 100%
rename from roots/base/bash_functions
rename to states/base/bash_functions
diff --git a/roots/base/bashrc b/states/base/bashrc
similarity index 100%
rename from roots/base/bashrc
rename to states/base/bashrc
diff --git a/roots/base/init.sls b/states/base/init.sls
similarity index 100%
rename from roots/base/init.sls
rename to states/base/init.sls
diff --git a/roots/base/screenrc b/states/base/screenrc
similarity index 100%
rename from roots/base/screenrc
rename to states/base/screenrc
diff --git a/roots/gnuviechadmin/base.sls b/states/gnuviechadmin/base.sls
similarity index 100%
rename from roots/gnuviechadmin/base.sls
rename to states/gnuviechadmin/base.sls
diff --git a/roots/gnuviechadmin/bash_functions b/states/gnuviechadmin/bash_functions
similarity index 100%
rename from roots/gnuviechadmin/bash_functions
rename to states/gnuviechadmin/bash_functions
diff --git a/roots/gnuviechadmin/celery.sls b/states/gnuviechadmin/celery.sls
similarity index 100%
rename from roots/gnuviechadmin/celery.sls
rename to states/gnuviechadmin/celery.sls
diff --git a/roots/gnuviechadmin/database.sls b/states/gnuviechadmin/database.sls
similarity index 100%
rename from roots/gnuviechadmin/database.sls
rename to states/gnuviechadmin/database.sls
diff --git a/roots/gnuviechadmin/gva/gnuviechadmin.nginx b/states/gnuviechadmin/gva/gnuviechadmin.nginx
similarity index 100%
rename from roots/gnuviechadmin/gva/gnuviechadmin.nginx
rename to states/gnuviechadmin/gva/gnuviechadmin.nginx
diff --git a/roots/gnuviechadmin/gva/settings.sh b/states/gnuviechadmin/gva/settings.sh
similarity index 100%
rename from roots/gnuviechadmin/gva/settings.sh
rename to states/gnuviechadmin/gva/settings.sh
diff --git a/roots/gnuviechadmin/gvaldap.sls b/states/gnuviechadmin/gvaldap.sls
similarity index 100%
rename from roots/gnuviechadmin/gvaldap.sls
rename to states/gnuviechadmin/gvaldap.sls
diff --git a/roots/gnuviechadmin/gvaldap/create_base_ldap_objects.sh b/states/gnuviechadmin/gvaldap/create_base_ldap_objects.sh
similarity index 100%
rename from roots/gnuviechadmin/gvaldap/create_base_ldap_objects.sh
rename to states/gnuviechadmin/gvaldap/create_base_ldap_objects.sh
diff --git a/roots/gnuviechadmin/gvaldap/run_celery.sh b/states/gnuviechadmin/gvaldap/run_celery.sh
similarity index 100%
rename from roots/gnuviechadmin/gvaldap/run_celery.sh
rename to states/gnuviechadmin/gvaldap/run_celery.sh
diff --git a/roots/gnuviechadmin/gvaldap/settings.sh b/states/gnuviechadmin/gvaldap/settings.sh
similarity index 100%
rename from roots/gnuviechadmin/gvaldap/settings.sh
rename to states/gnuviechadmin/gvaldap/settings.sh
diff --git a/roots/gnuviechadmin/queues.sls b/states/gnuviechadmin/queues.sls
similarity index 100%
rename from roots/gnuviechadmin/queues.sls
rename to states/gnuviechadmin/queues.sls
diff --git a/roots/gnuviechadmin/vars.sls b/states/gnuviechadmin/vars.sls
similarity index 100%
rename from roots/gnuviechadmin/vars.sls
rename to states/gnuviechadmin/vars.sls
diff --git a/roots/gnuviechadmin/webinterface.sls b/states/gnuviechadmin/webinterface.sls
similarity index 100%
rename from roots/gnuviechadmin/webinterface.sls
rename to states/gnuviechadmin/webinterface.sls
diff --git a/roots/ldapserver/init.sls b/states/ldapserver/init.sls
similarity index 100%
rename from roots/ldapserver/init.sls
rename to states/ldapserver/init.sls
diff --git a/roots/nginx/init.sls b/states/nginx/init.sls
similarity index 100%
rename from roots/nginx/init.sls
rename to states/nginx/init.sls
diff --git a/roots/nginx/nginx.conf b/states/nginx/nginx.conf
similarity index 100%
rename from roots/nginx/nginx.conf
rename to states/nginx/nginx.conf
diff --git a/roots/postgresql-server/init.sls b/states/postgresql-server/init.sls
similarity index 100%
rename from roots/postgresql-server/init.sls
rename to states/postgresql-server/init.sls
diff --git a/roots/rabbitmq-server/init.sls b/states/rabbitmq-server/init.sls
similarity index 100%
rename from roots/rabbitmq-server/init.sls
rename to states/rabbitmq-server/init.sls
diff --git a/roots/redis-server/init.sls b/states/redis-server/init.sls
similarity index 100%
rename from roots/redis-server/init.sls
rename to states/redis-server/init.sls
diff --git a/roots/redis-server/redis.conf b/states/redis-server/redis.conf
similarity index 100%
rename from roots/redis-server/redis.conf
rename to states/redis-server/redis.conf
diff --git a/roots/top.sls b/states/top.sls
similarity index 100%
rename from roots/top.sls
rename to states/top.sls
diff --git a/roots/vim/init.sls b/states/vim/init.sls
similarity index 100%
rename from roots/vim/init.sls
rename to states/vim/init.sls
diff --git a/roots/vim/vimrc b/states/vim/vimrc
similarity index 100%
rename from roots/vim/vimrc
rename to states/vim/vimrc
diff --git a/roots/webserver/init.sls b/states/webserver/init.sls
similarity index 100%
rename from roots/webserver/init.sls
rename to states/webserver/init.sls
diff --git a/roots/webserver/nginx-logformat.conf b/states/webserver/nginx-logformat.conf
similarity index 100%
rename from roots/webserver/nginx-logformat.conf
rename to states/webserver/nginx-logformat.conf
diff --git a/roots/webserver/nginx-security.conf b/states/webserver/nginx-security.conf
similarity index 100%
rename from roots/webserver/nginx-security.conf
rename to states/webserver/nginx-security.conf
diff --git a/roots/webserver/nginx-ssl.conf b/states/webserver/nginx-ssl.conf
similarity index 100%
rename from roots/webserver/nginx-ssl.conf
rename to states/webserver/nginx-ssl.conf
diff --git a/roots/webserver/sslcert.macros.sls b/states/webserver/sslcert.macros.sls
similarity index 100%
rename from roots/webserver/sslcert.macros.sls
rename to states/webserver/sslcert.macros.sls