diff --git a/ipa-server/autogen.sh b/autogen.sh
similarity index 100%
rename from ipa-server/autogen.sh
rename to autogen.sh
diff --git a/ipa-server/ipa-kpasswd/Makefile.am b/daemons/ipa-kpasswd/Makefile.am
similarity index 100%
rename from ipa-server/ipa-kpasswd/Makefile.am
rename to daemons/ipa-kpasswd/Makefile.am
diff --git a/ipa-server/ipa-kpasswd/README b/daemons/ipa-kpasswd/README
similarity index 100%
rename from ipa-server/ipa-kpasswd/README
rename to daemons/ipa-kpasswd/README
diff --git a/ipa-server/ipa-kpasswd/ipa_kpasswd.c b/daemons/ipa-kpasswd/ipa_kpasswd.c
similarity index 100%
rename from ipa-server/ipa-kpasswd/ipa_kpasswd.c
rename to daemons/ipa-kpasswd/ipa_kpasswd.c
diff --git a/ipa-server/ipa-kpasswd/ipa_kpasswd.init b/daemons/ipa-kpasswd/ipa_kpasswd.init
similarity index 100%
rename from ipa-server/ipa-kpasswd/ipa_kpasswd.init
rename to daemons/ipa-kpasswd/ipa_kpasswd.init
diff --git a/ipa-server/ipa-slapi-plugins/Makefile.am b/daemons/ipa-slapi-plugins/Makefile.am
similarity index 100%
rename from ipa-server/ipa-slapi-plugins/Makefile.am
rename to daemons/ipa-slapi-plugins/Makefile.am
diff --git a/ipa-server/ipa-slapi-plugins/README b/daemons/ipa-slapi-plugins/README
similarity index 100%
rename from ipa-server/ipa-slapi-plugins/README
rename to daemons/ipa-slapi-plugins/README
diff --git a/ipa-server/ipa-slapi-plugins/dna/Makefile.am b/daemons/ipa-slapi-plugins/dna/Makefile.am
similarity index 100%
rename from ipa-server/ipa-slapi-plugins/dna/Makefile.am
rename to daemons/ipa-slapi-plugins/dna/Makefile.am
diff --git a/ipa-server/ipa-slapi-plugins/dna/dna-conf.ldif b/daemons/ipa-slapi-plugins/dna/dna-conf.ldif
similarity index 100%
rename from ipa-server/ipa-slapi-plugins/dna/dna-conf.ldif
rename to daemons/ipa-slapi-plugins/dna/dna-conf.ldif
diff --git a/ipa-server/ipa-slapi-plugins/dna/dna.c b/daemons/ipa-slapi-plugins/dna/dna.c
similarity index 100%
rename from ipa-server/ipa-slapi-plugins/dna/dna.c
rename to daemons/ipa-slapi-plugins/dna/dna.c
diff --git a/ipa-server/ipa-slapi-plugins/ipa-memberof/Makefile.am b/daemons/ipa-slapi-plugins/ipa-memberof/Makefile.am
similarity index 100%
rename from ipa-server/ipa-slapi-plugins/ipa-memberof/Makefile.am
rename to daemons/ipa-slapi-plugins/ipa-memberof/Makefile.am
diff --git a/ipa-server/ipa-slapi-plugins/ipa-memberof/ipa-memberof.c b/daemons/ipa-slapi-plugins/ipa-memberof/ipa-memberof.c
similarity index 100%
rename from ipa-server/ipa-slapi-plugins/ipa-memberof/ipa-memberof.c
rename to daemons/ipa-slapi-plugins/ipa-memberof/ipa-memberof.c
diff --git a/ipa-server/ipa-slapi-plugins/ipa-memberof/ipa-memberof.h b/daemons/ipa-slapi-plugins/ipa-memberof/ipa-memberof.h
similarity index 100%
rename from ipa-server/ipa-slapi-plugins/ipa-memberof/ipa-memberof.h
rename to daemons/ipa-slapi-plugins/ipa-memberof/ipa-memberof.h
diff --git a/ipa-server/ipa-slapi-plugins/ipa-memberof/ipa-memberof_config.c b/daemons/ipa-slapi-plugins/ipa-memberof/ipa-memberof_config.c
similarity index 100%
rename from ipa-server/ipa-slapi-plugins/ipa-memberof/ipa-memberof_config.c
rename to daemons/ipa-slapi-plugins/ipa-memberof/ipa-memberof_config.c
diff --git a/ipa-server/ipa-slapi-plugins/ipa-memberof/memberof-conf.ldif b/daemons/ipa-slapi-plugins/ipa-memberof/memberof-conf.ldif
similarity index 100%
rename from ipa-server/ipa-slapi-plugins/ipa-memberof/memberof-conf.ldif
rename to daemons/ipa-slapi-plugins/ipa-memberof/memberof-conf.ldif
diff --git a/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/Makefile.am b/daemons/ipa-slapi-plugins/ipa-pwd-extop/Makefile.am
similarity index 100%
rename from ipa-server/ipa-slapi-plugins/ipa-pwd-extop/Makefile.am
rename to daemons/ipa-slapi-plugins/ipa-pwd-extop/Makefile.am
diff --git a/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/README b/daemons/ipa-slapi-plugins/ipa-pwd-extop/README
similarity index 100%
rename from ipa-server/ipa-slapi-plugins/ipa-pwd-extop/README
rename to daemons/ipa-slapi-plugins/ipa-pwd-extop/README
diff --git a/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c b/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c
similarity index 100%
rename from ipa-server/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c
rename to daemons/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c
diff --git a/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/pwd-extop-conf.ldif b/daemons/ipa-slapi-plugins/ipa-pwd-extop/pwd-extop-conf.ldif
similarity index 100%
rename from ipa-server/ipa-slapi-plugins/ipa-pwd-extop/pwd-extop-conf.ldif
rename to daemons/ipa-slapi-plugins/ipa-pwd-extop/pwd-extop-conf.ldif
diff --git a/ipa-server/ipa-slapi-plugins/ipa-winsync/Makefile.am b/daemons/ipa-slapi-plugins/ipa-winsync/Makefile.am
similarity index 100%
rename from ipa-server/ipa-slapi-plugins/ipa-winsync/Makefile.am
rename to daemons/ipa-slapi-plugins/ipa-winsync/Makefile.am
diff --git a/ipa-server/ipa-slapi-plugins/ipa-winsync/README b/daemons/ipa-slapi-plugins/ipa-winsync/README
similarity index 100%
rename from ipa-server/ipa-slapi-plugins/ipa-winsync/README
rename to daemons/ipa-slapi-plugins/ipa-winsync/README
diff --git a/ipa-server/ipa-slapi-plugins/ipa-winsync/ipa-winsync-conf.ldif b/daemons/ipa-slapi-plugins/ipa-winsync/ipa-winsync-conf.ldif
similarity index 100%
rename from ipa-server/ipa-slapi-plugins/ipa-winsync/ipa-winsync-conf.ldif
rename to daemons/ipa-slapi-plugins/ipa-winsync/ipa-winsync-conf.ldif
diff --git a/ipa-server/ipa-slapi-plugins/ipa-winsync/ipa-winsync-config.c b/daemons/ipa-slapi-plugins/ipa-winsync/ipa-winsync-config.c
similarity index 100%
rename from ipa-server/ipa-slapi-plugins/ipa-winsync/ipa-winsync-config.c
rename to daemons/ipa-slapi-plugins/ipa-winsync/ipa-winsync-config.c
diff --git a/ipa-server/ipa-slapi-plugins/ipa-winsync/ipa-winsync.c b/daemons/ipa-slapi-plugins/ipa-winsync/ipa-winsync.c
similarity index 100%
rename from ipa-server/ipa-slapi-plugins/ipa-winsync/ipa-winsync.c
rename to daemons/ipa-slapi-plugins/ipa-winsync/ipa-winsync.c
diff --git a/ipa-server/ipa-slapi-plugins/ipa-winsync/ipa-winsync.h b/daemons/ipa-slapi-plugins/ipa-winsync/ipa-winsync.h
similarity index 100%
rename from ipa-server/ipa-slapi-plugins/ipa-winsync/ipa-winsync.h
rename to daemons/ipa-slapi-plugins/ipa-winsync/ipa-winsync.h
diff --git a/ipa-server/xmlrpc-server/ipa-rewrite.conf b/install/conf/ipa-rewrite.conf
similarity index 100%
rename from ipa-server/xmlrpc-server/ipa-rewrite.conf
rename to install/conf/ipa-rewrite.conf
diff --git a/ipa-server/xmlrpc-server/ipa.conf b/install/conf/ipa.conf
similarity index 100%
rename from ipa-server/xmlrpc-server/ipa.conf
rename to install/conf/ipa.conf
diff --git a/ipa-server/xmlrpc-server/ssbrowser.html b/install/html/ssbrowser.html
similarity index 100%
rename from ipa-server/xmlrpc-server/ssbrowser.html
rename to install/html/ssbrowser.html
diff --git a/ipa-server/xmlrpc-server/unauthorized.html b/install/html/unauthorized.html
similarity index 100%
rename from ipa-server/xmlrpc-server/unauthorized.html
rename to install/html/unauthorized.html
diff --git a/ipa-server/ipa-install/share/60ipaconfig.ldif b/install/share/60ipaconfig.ldif
similarity index 100%
rename from ipa-server/ipa-install/share/60ipaconfig.ldif
rename to install/share/60ipaconfig.ldif
diff --git a/ipa-server/ipa-install/share/60kerberos.ldif b/install/share/60kerberos.ldif
similarity index 100%
rename from ipa-server/ipa-install/share/60kerberos.ldif
rename to install/share/60kerberos.ldif
diff --git a/ipa-server/ipa-install/share/60radius.ldif b/install/share/60radius.ldif
similarity index 100%
rename from ipa-server/ipa-install/share/60radius.ldif
rename to install/share/60radius.ldif
diff --git a/ipa-server/ipa-install/share/60samba.ldif b/install/share/60samba.ldif
similarity index 100%
rename from ipa-server/ipa-install/share/60samba.ldif
rename to install/share/60samba.ldif
diff --git a/ipa-server/ipa-install/share/Makefile.am b/install/share/Makefile.am
similarity index 100%
rename from ipa-server/ipa-install/share/Makefile.am
rename to install/share/Makefile.am
diff --git a/ipa-server/ipa-install/share/bind.named.conf.template b/install/share/bind.named.conf.template
similarity index 100%
rename from ipa-server/ipa-install/share/bind.named.conf.template
rename to install/share/bind.named.conf.template
diff --git a/ipa-server/ipa-install/share/bind.zone.db.template b/install/share/bind.zone.db.template
similarity index 100%
rename from ipa-server/ipa-install/share/bind.zone.db.template
rename to install/share/bind.zone.db.template
diff --git a/ipa-server/ipa-install/share/bootstrap-template.ldif b/install/share/bootstrap-template.ldif
similarity index 100%
rename from ipa-server/ipa-install/share/bootstrap-template.ldif
rename to install/share/bootstrap-template.ldif
diff --git a/ipa-server/ipa-install/share/certmap.conf.template b/install/share/certmap.conf.template
similarity index 100%
rename from ipa-server/ipa-install/share/certmap.conf.template
rename to install/share/certmap.conf.template
diff --git a/ipa-server/ipa-install/share/default-aci.ldif b/install/share/default-aci.ldif
similarity index 100%
rename from ipa-server/ipa-install/share/default-aci.ldif
rename to install/share/default-aci.ldif
diff --git a/ipa-server/ipa-install/share/default-keytypes.ldif b/install/share/default-keytypes.ldif
similarity index 100%
rename from ipa-server/ipa-install/share/default-keytypes.ldif
rename to install/share/default-keytypes.ldif
diff --git a/ipa-server/ipa-install/share/dna-posix.ldif b/install/share/dna-posix.ldif
similarity index 100%
rename from ipa-server/ipa-install/share/dna-posix.ldif
rename to install/share/dna-posix.ldif
diff --git a/ipa-server/ipa-install/share/encrypted_attribute.ldif b/install/share/encrypted_attribute.ldif
similarity index 100%
rename from ipa-server/ipa-install/share/encrypted_attribute.ldif
rename to install/share/encrypted_attribute.ldif
diff --git a/ipa-server/ipa-install/share/fedora-ds.init.patch b/install/share/fedora-ds.init.patch
similarity index 100%
rename from ipa-server/ipa-install/share/fedora-ds.init.patch
rename to install/share/fedora-ds.init.patch
diff --git a/ipa-server/ipa-install/share/indices.ldif b/install/share/indices.ldif
similarity index 100%
rename from ipa-server/ipa-install/share/indices.ldif
rename to install/share/indices.ldif
diff --git a/ipa-server/ipa-install/share/kdc.conf.template b/install/share/kdc.conf.template
similarity index 100%
rename from ipa-server/ipa-install/share/kdc.conf.template
rename to install/share/kdc.conf.template
diff --git a/ipa-server/ipa-install/share/kerberos.ldif b/install/share/kerberos.ldif
similarity index 100%
rename from ipa-server/ipa-install/share/kerberos.ldif
rename to install/share/kerberos.ldif
diff --git a/ipa-server/ipa-install/share/krb.con.template b/install/share/krb.con.template
similarity index 100%
rename from ipa-server/ipa-install/share/krb.con.template
rename to install/share/krb.con.template
diff --git a/ipa-server/ipa-install/share/krb5.conf.template b/install/share/krb5.conf.template
similarity index 100%
rename from ipa-server/ipa-install/share/krb5.conf.template
rename to install/share/krb5.conf.template
diff --git a/ipa-server/ipa-install/share/krb5.ini.template b/install/share/krb5.ini.template
similarity index 100%
rename from ipa-server/ipa-install/share/krb5.ini.template
rename to install/share/krb5.ini.template
diff --git a/ipa-server/ipa-install/share/krbrealm.con.template b/install/share/krbrealm.con.template
similarity index 100%
rename from ipa-server/ipa-install/share/krbrealm.con.template
rename to install/share/krbrealm.con.template
diff --git a/ipa-server/ipa-install/share/master-entry.ldif b/install/share/master-entry.ldif
similarity index 100%
rename from ipa-server/ipa-install/share/master-entry.ldif
rename to install/share/master-entry.ldif
diff --git a/ipa-server/ipa-install/share/memberof-task.ldif b/install/share/memberof-task.ldif
similarity index 100%
rename from ipa-server/ipa-install/share/memberof-task.ldif
rename to install/share/memberof-task.ldif
diff --git a/ipa-server/ipa-install/share/ntp.conf.server.template b/install/share/ntp.conf.server.template
similarity index 100%
rename from ipa-server/ipa-install/share/ntp.conf.server.template
rename to install/share/ntp.conf.server.template
diff --git a/ipa-server/ipa-install/share/ntpd.sysconfig.template b/install/share/ntpd.sysconfig.template
similarity index 100%
rename from ipa-server/ipa-install/share/ntpd.sysconfig.template
rename to install/share/ntpd.sysconfig.template
diff --git a/ipa-server/ipa-install/share/preferences.html.template b/install/share/preferences.html.template
similarity index 100%
rename from ipa-server/ipa-install/share/preferences.html.template
rename to install/share/preferences.html.template
diff --git a/ipa-server/ipa-install/share/referint-conf.ldif b/install/share/referint-conf.ldif
similarity index 100%
rename from ipa-server/ipa-install/share/referint-conf.ldif
rename to install/share/referint-conf.ldif
diff --git a/ipa-server/ipa-install/share/schema_compat.uldif b/install/share/schema_compat.uldif
similarity index 100%
rename from ipa-server/ipa-install/share/schema_compat.uldif
rename to install/share/schema_compat.uldif
diff --git a/ipa-server/ipa-install/share/unique-attributes.ldif b/install/share/unique-attributes.ldif
similarity index 100%
rename from ipa-server/ipa-install/share/unique-attributes.ldif
rename to install/share/unique-attributes.ldif
diff --git a/ipa-server/ipa-install/Makefile.am b/install/tools/Makefile.am
similarity index 100%
rename from ipa-server/ipa-install/Makefile.am
rename to install/tools/Makefile.am
diff --git a/ipa-server/ipa-install/README b/install/tools/README
similarity index 100%
rename from ipa-server/ipa-install/README
rename to install/tools/README
diff --git a/ipa-server/ipa-compat-manage b/install/tools/ipa-compat-manage
similarity index 100%
rename from ipa-server/ipa-compat-manage
rename to install/tools/ipa-compat-manage
diff --git a/ipa-server/ipa-fix-CVE-2008-3274 b/install/tools/ipa-fix-CVE-2008-3274
similarity index 100%
rename from ipa-server/ipa-fix-CVE-2008-3274
rename to install/tools/ipa-fix-CVE-2008-3274
diff --git a/ipa-server/ipa-ldap-updater b/install/tools/ipa-ldap-updater
similarity index 100%
rename from ipa-server/ipa-ldap-updater
rename to install/tools/ipa-ldap-updater
diff --git a/ipa-server/ipa-install/ipa-replica-install b/install/tools/ipa-replica-install
similarity index 100%
rename from ipa-server/ipa-install/ipa-replica-install
rename to install/tools/ipa-replica-install
diff --git a/ipa-server/ipa-install/ipa-replica-manage b/install/tools/ipa-replica-manage
similarity index 100%
rename from ipa-server/ipa-install/ipa-replica-manage
rename to install/tools/ipa-replica-manage
diff --git a/ipa-server/ipa-install/ipa-replica-prepare b/install/tools/ipa-replica-prepare
similarity index 100%
rename from ipa-server/ipa-install/ipa-replica-prepare
rename to install/tools/ipa-replica-prepare
diff --git a/ipa-server/ipa-install/ipa-server-certinstall b/install/tools/ipa-server-certinstall
similarity index 100%
rename from ipa-server/ipa-install/ipa-server-certinstall
rename to install/tools/ipa-server-certinstall
diff --git a/ipa-server/ipa-install/ipa-server-install b/install/tools/ipa-server-install
similarity index 100%
rename from ipa-server/ipa-install/ipa-server-install
rename to install/tools/ipa-server-install
diff --git a/ipa-server/ipa-upgradeconfig b/install/tools/ipa-upgradeconfig
similarity index 100%
rename from ipa-server/ipa-upgradeconfig
rename to install/tools/ipa-upgradeconfig
diff --git a/ipa-server/ipa-install/ipactl b/install/tools/ipactl
similarity index 100%
rename from ipa-server/ipa-install/ipactl
rename to install/tools/ipactl
diff --git a/ipa-server/man/Makefile.am b/install/tools/man/Makefile.am
similarity index 100%
rename from ipa-server/man/Makefile.am
rename to install/tools/man/Makefile.am
diff --git a/ipa-server/man/ipa-compat-manage.1 b/install/tools/man/ipa-compat-manage.1
similarity index 100%
rename from ipa-server/man/ipa-compat-manage.1
rename to install/tools/man/ipa-compat-manage.1
diff --git a/ipa-server/man/ipa-ldap-updater.1 b/install/tools/man/ipa-ldap-updater.1
similarity index 100%
rename from ipa-server/man/ipa-ldap-updater.1
rename to install/tools/man/ipa-ldap-updater.1
diff --git a/ipa-server/man/ipa-replica-install.1 b/install/tools/man/ipa-replica-install.1
similarity index 100%
rename from ipa-server/man/ipa-replica-install.1
rename to install/tools/man/ipa-replica-install.1
diff --git a/ipa-server/man/ipa-replica-manage.1 b/install/tools/man/ipa-replica-manage.1
similarity index 100%
rename from ipa-server/man/ipa-replica-manage.1
rename to install/tools/man/ipa-replica-manage.1
diff --git a/ipa-server/man/ipa-replica-prepare.1 b/install/tools/man/ipa-replica-prepare.1
similarity index 100%
rename from ipa-server/man/ipa-replica-prepare.1
rename to install/tools/man/ipa-replica-prepare.1
diff --git a/ipa-server/man/ipa-server-certinstall.1 b/install/tools/man/ipa-server-certinstall.1
similarity index 100%
rename from ipa-server/man/ipa-server-certinstall.1
rename to install/tools/man/ipa-server-certinstall.1
diff --git a/ipa-server/man/ipa-server-install.1 b/install/tools/man/ipa-server-install.1
similarity index 100%
rename from ipa-server/man/ipa-server-install.1
rename to install/tools/man/ipa-server-install.1
diff --git a/ipa-server/man/ipa_kpasswd.8 b/install/tools/man/ipa_kpasswd.8
similarity index 100%
rename from ipa-server/man/ipa_kpasswd.8
rename to install/tools/man/ipa_kpasswd.8
diff --git a/ipa-server/man/ipa_webgui.8 b/install/tools/man/ipa_webgui.8
similarity index 100%
rename from ipa-server/man/ipa_webgui.8
rename to install/tools/man/ipa_webgui.8
diff --git a/ipa-server/man/ipactl.8 b/install/tools/man/ipactl.8
similarity index 100%
rename from ipa-server/man/ipactl.8
rename to install/tools/man/ipactl.8
diff --git a/ipa-server/ipa-install/updates/Makefile.am b/install/updates/Makefile.am
similarity index 100%
rename from ipa-server/ipa-install/updates/Makefile.am
rename to install/updates/Makefile.am
diff --git a/ipa-server/ipa-install/updates/RFC2307bis.update b/install/updates/RFC2307bis.update
similarity index 100%
rename from ipa-server/ipa-install/updates/RFC2307bis.update
rename to install/updates/RFC2307bis.update
diff --git a/ipa-server/ipa-install/updates/RFC4876.update b/install/updates/RFC4876.update
similarity index 100%
rename from ipa-server/ipa-install/updates/RFC4876.update
rename to install/updates/RFC4876.update
diff --git a/ipa-server/ipa-install/updates/indices.update b/install/updates/indices.update
similarity index 100%
rename from ipa-server/ipa-install/updates/indices.update
rename to install/updates/indices.update
diff --git a/ipa-server/ipa-install/updates/nss_ldap.update b/install/updates/nss_ldap.update
similarity index 100%
rename from ipa-server/ipa-install/updates/nss_ldap.update
rename to install/updates/nss_ldap.update
diff --git a/ipa-server/ipa-install/updates/replication.update b/install/updates/replication.update
similarity index 100%
rename from ipa-server/ipa-install/updates/replication.update
rename to install/updates/replication.update
diff --git a/ipa-server/ipa-install/updates/winsync_index.update b/install/updates/winsync_index.update
similarity index 100%
rename from ipa-server/ipa-install/updates/winsync_index.update
rename to install/updates/winsync_index.update
diff --git a/ipa-server/ipaserver/Makefile.am b/ipaserver/install/Makefile.am
similarity index 100%
rename from ipa-server/ipaserver/Makefile.am
rename to ipaserver/install/Makefile.am
diff --git a/ipa-server/ipaserver/__init__.py b/ipaserver/install/__init__.py
similarity index 100%
rename from ipa-server/ipaserver/__init__.py
rename to ipaserver/install/__init__.py
diff --git a/ipa-server/ipaserver/bindinstance.py b/ipaserver/install/bindinstance.py
similarity index 100%
rename from ipa-server/ipaserver/bindinstance.py
rename to ipaserver/install/bindinstance.py
diff --git a/ipa-server/ipaserver/certs.py b/ipaserver/install/certs.py
similarity index 100%
rename from ipa-server/ipaserver/certs.py
rename to ipaserver/install/certs.py
diff --git a/ipa-server/ipaserver/dsinstance.py b/ipaserver/install/dsinstance.py
similarity index 100%
rename from ipa-server/ipaserver/dsinstance.py
rename to ipaserver/install/dsinstance.py
diff --git a/ipa-server/ipaserver/httpinstance.py b/ipaserver/install/httpinstance.py
similarity index 100%
rename from ipa-server/ipaserver/httpinstance.py
rename to ipaserver/install/httpinstance.py
diff --git a/ipa-server/ipaserver/installutils.py b/ipaserver/install/installutils.py
similarity index 100%
rename from ipa-server/ipaserver/installutils.py
rename to ipaserver/install/installutils.py
diff --git a/ipa-server/ipaserver/ipaldap.py b/ipaserver/install/ipaldap.py
similarity index 100%
rename from ipa-server/ipaserver/ipaldap.py
rename to ipaserver/install/ipaldap.py
diff --git a/ipa-server/ipaserver/krbinstance.py b/ipaserver/install/krbinstance.py
similarity index 100%
rename from ipa-server/ipaserver/krbinstance.py
rename to ipaserver/install/krbinstance.py
diff --git a/ipa-server/ipaserver/ldapupdate.py b/ipaserver/install/ldapupdate.py
similarity index 100%
rename from ipa-server/ipaserver/ldapupdate.py
rename to ipaserver/install/ldapupdate.py
diff --git a/ipa-server/ipaserver/ntpinstance.py b/ipaserver/install/ntpinstance.py
similarity index 100%
rename from ipa-server/ipaserver/ntpinstance.py
rename to ipaserver/install/ntpinstance.py
diff --git a/ipa-server/ipaserver/replication.py b/ipaserver/install/replication.py
similarity index 100%
rename from ipa-server/ipaserver/replication.py
rename to ipaserver/install/replication.py
diff --git a/ipa-server/ipaserver/service.py b/ipaserver/install/service.py
similarity index 100%
rename from ipa-server/ipaserver/service.py
rename to ipaserver/install/service.py
diff --git a/ipa-server/selinux/Makefile b/selinux/Makefile
similarity index 100%
rename from ipa-server/selinux/Makefile
rename to selinux/Makefile
diff --git a/ipa-server/selinux/ipa-server-selinux.spec.in b/selinux/ipa-server-selinux.spec.in
similarity index 100%
rename from ipa-server/selinux/ipa-server-selinux.spec.in
rename to selinux/ipa-server-selinux.spec.in
diff --git a/ipa-server/selinux/ipa_kpasswd/ipa_kpasswd.fc b/selinux/ipa_kpasswd/ipa_kpasswd.fc
similarity index 100%
rename from ipa-server/selinux/ipa_kpasswd/ipa_kpasswd.fc
rename to selinux/ipa_kpasswd/ipa_kpasswd.fc
diff --git a/ipa-server/selinux/ipa_kpasswd/ipa_kpasswd.te b/selinux/ipa_kpasswd/ipa_kpasswd.te
similarity index 100%
rename from ipa-server/selinux/ipa_kpasswd/ipa_kpasswd.te
rename to selinux/ipa_kpasswd/ipa_kpasswd.te
diff --git a/ipa-server/selinux/ipa_webgui/ipa_webgui.fc b/selinux/ipa_webgui/ipa_webgui.fc
similarity index 100%
rename from ipa-server/selinux/ipa_webgui/ipa_webgui.fc
rename to selinux/ipa_webgui/ipa_webgui.fc
diff --git a/ipa-server/selinux/ipa_webgui/ipa_webgui.te b/selinux/ipa_webgui/ipa_webgui.te
similarity index 100%
rename from ipa-server/selinux/ipa_webgui/ipa_webgui.te
rename to selinux/ipa_webgui/ipa_webgui.te
diff --git a/ipa-server/version.m4.in b/version.m4.in
similarity index 100%
rename from ipa-server/version.m4.in
rename to version.m4.in