diff --git a/example-config/README b/ipa-admintools/README
similarity index 100%
rename from example-config/README
rename to ipa-admintools/README
diff --git a/ipa-server/Makefile b/ipa-server/Makefile
new file mode 100644
index 000000000..1417a19db
--- /dev/null
+++ b/ipa-server/Makefile
@@ -0,0 +1,16 @@
+SUBDIRS=ipa-install
+
+all:
+	@for subdir in $(SUBDIRS); do \
+		(cd $$subdir && $(MAKE) $@) || exit 1; \
+	done
+
+install:
+	@for subdir in $(SUBDIRS); do \
+		(cd $$subdir && $(MAKE) $@) || exit 1; \
+	done
+
+clean:
+	@for subdir in $(SUBDIRS); do \
+		(cd $$subdir && $(MAKE) $@) || exit 1; \
+	done
diff --git a/ipa-install/Makefile b/ipa-server/ipa-install/Makefile
similarity index 100%
rename from ipa-install/Makefile
rename to ipa-server/ipa-install/Makefile
diff --git a/ipa-install/README b/ipa-server/ipa-install/README
similarity index 100%
rename from ipa-install/README
rename to ipa-server/ipa-install/README
diff --git a/ipa-install/share/60kerberos.ldif b/ipa-server/ipa-install/share/60kerberos.ldif
similarity index 100%
rename from ipa-install/share/60kerberos.ldif
rename to ipa-server/ipa-install/share/60kerberos.ldif
diff --git a/ipa-install/share/60samba.ldif b/ipa-server/ipa-install/share/60samba.ldif
similarity index 100%
rename from ipa-install/share/60samba.ldif
rename to ipa-server/ipa-install/share/60samba.ldif
diff --git a/ipa-install/share/Makefile b/ipa-server/ipa-install/share/Makefile
similarity index 100%
rename from ipa-install/share/Makefile
rename to ipa-server/ipa-install/share/Makefile
diff --git a/ipa-install/share/bind.zone.db.template b/ipa-server/ipa-install/share/bind.zone.db.template
similarity index 100%
rename from ipa-install/share/bind.zone.db.template
rename to ipa-server/ipa-install/share/bind.zone.db.template
diff --git a/ipa-install/share/bootstrap-template.ldif b/ipa-server/ipa-install/share/bootstrap-template.ldif
similarity index 100%
rename from ipa-install/share/bootstrap-template.ldif
rename to ipa-server/ipa-install/share/bootstrap-template.ldif
diff --git a/ipa-install/share/default-aci.ldif b/ipa-server/ipa-install/share/default-aci.ldif
similarity index 100%
rename from ipa-install/share/default-aci.ldif
rename to ipa-server/ipa-install/share/default-aci.ldif
diff --git a/ipa-install/share/fedora-ds.init.patch b/ipa-server/ipa-install/share/fedora-ds.init.patch
similarity index 100%
rename from ipa-install/share/fedora-ds.init.patch
rename to ipa-server/ipa-install/share/fedora-ds.init.patch
diff --git a/ipa-install/share/kdc.conf.template b/ipa-server/ipa-install/share/kdc.conf.template
similarity index 100%
rename from ipa-install/share/kdc.conf.template
rename to ipa-server/ipa-install/share/kdc.conf.template
diff --git a/ipa-install/share/kerberos.ldif b/ipa-server/ipa-install/share/kerberos.ldif
similarity index 100%
rename from ipa-install/share/kerberos.ldif
rename to ipa-server/ipa-install/share/kerberos.ldif
diff --git a/ipa-install/share/krb5.conf.template b/ipa-server/ipa-install/share/krb5.conf.template
similarity index 100%
rename from ipa-install/share/krb5.conf.template
rename to ipa-server/ipa-install/share/krb5.conf.template
diff --git a/ipa-install/src/Makefile b/ipa-server/ipa-install/src/Makefile
similarity index 100%
rename from ipa-install/src/Makefile
rename to ipa-server/ipa-install/src/Makefile
diff --git a/ipa-install/src/ipa-server-install b/ipa-server/ipa-install/src/ipa-server-install
similarity index 100%
rename from ipa-install/src/ipa-server-install
rename to ipa-server/ipa-install/src/ipa-server-install
diff --git a/ipa-install/src/ipa-server-setupssl b/ipa-server/ipa-install/src/ipa-server-setupssl
similarity index 100%
rename from ipa-install/src/ipa-server-setupssl
rename to ipa-server/ipa-install/src/ipa-server-setupssl
diff --git a/ipa-install/src/ipa/__init__.py b/ipa-server/ipa-install/src/ipa/__init__.py
similarity index 100%
rename from ipa-install/src/ipa/__init__.py
rename to ipa-server/ipa-install/src/ipa/__init__.py
diff --git a/ipa-install/src/ipa/dsinstance.py b/ipa-server/ipa-install/src/ipa/dsinstance.py
similarity index 100%
rename from ipa-install/src/ipa/dsinstance.py
rename to ipa-server/ipa-install/src/ipa/dsinstance.py
diff --git a/ipa-install/src/ipa/krbinstance.py b/ipa-server/ipa-install/src/ipa/krbinstance.py
similarity index 100%
rename from ipa-install/src/ipa/krbinstance.py
rename to ipa-server/ipa-install/src/ipa/krbinstance.py
diff --git a/ipa-install/test/test-users.ldif b/ipa-server/ipa-install/test/test-users.ldif
similarity index 100%
rename from ipa-install/test/test-users.ldif
rename to ipa-server/ipa-install/test/test-users.ldif
diff --git a/ipa-cli/README b/ipa-server/ipa-slapi-plugins/README
similarity index 100%
rename from ipa-cli/README
rename to ipa-server/ipa-slapi-plugins/README
diff --git a/ipa-slapi-plugins/ipa-pwd-extop/Makefile b/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/Makefile
similarity index 100%
rename from ipa-slapi-plugins/ipa-pwd-extop/Makefile
rename to ipa-server/ipa-slapi-plugins/ipa-pwd-extop/Makefile
diff --git a/ipa-slapi-plugins/README b/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/README
similarity index 100%
rename from ipa-slapi-plugins/README
rename to ipa-server/ipa-slapi-plugins/ipa-pwd-extop/README
diff --git a/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c b/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c
similarity index 100%
rename from ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c
rename to ipa-server/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c
diff --git a/ipa-slapi-plugins/ipa-pwd-extop/plugin-conf.ldif b/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/plugin-conf.ldif
similarity index 100%
rename from ipa-slapi-plugins/ipa-pwd-extop/plugin-conf.ldif
rename to ipa-server/ipa-slapi-plugins/ipa-pwd-extop/plugin-conf.ldif
diff --git a/ipa-slapi-plugins/ipa-pwd-extop/README b/ipa-server/ipa-web/README
similarity index 100%
rename from ipa-slapi-plugins/ipa-pwd-extop/README
rename to ipa-server/ipa-web/README
diff --git a/ipa-web/README b/ipa-server/ipa-web/api/README
similarity index 100%
rename from ipa-web/README
rename to ipa-server/ipa-web/api/README
diff --git a/ipa-web/api/README b/ipa-server/ipa-web/client/README
similarity index 100%
rename from ipa-web/api/README
rename to ipa-server/ipa-web/client/README
diff --git a/ipa-web/client/README b/ipa-server/ipa-web/gui/README
similarity index 100%
rename from ipa-web/client/README
rename to ipa-server/ipa-web/gui/README
diff --git a/ipa-web/gui/README b/ipa-web/gui/README
deleted file mode 100644
index e69de29bb..000000000