diff --git a/Makefile b/Makefile
index bed16498..7ebe36e4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-SUBDIRS=libsepol libselinux libsemanage sepolgen checkpolicy secilc policycoreutils # policy
+SUBDIRS=libsepol libselinux libsemanage sepolgen checkpolicy secilc policycoreutils gui
 PYSUBDIRS=libselinux libsemanage
 DISTCLEANSUBDIRS=libselinux libsemanage
 
diff --git a/policycoreutils/gui/Makefile b/gui/Makefile
similarity index 100%
rename from policycoreutils/gui/Makefile
rename to gui/Makefile
diff --git a/policycoreutils/gui/booleansPage.py b/gui/booleansPage.py
similarity index 100%
rename from policycoreutils/gui/booleansPage.py
rename to gui/booleansPage.py
diff --git a/policycoreutils/gui/domainsPage.py b/gui/domainsPage.py
similarity index 100%
rename from policycoreutils/gui/domainsPage.py
rename to gui/domainsPage.py
diff --git a/policycoreutils/gui/fcontextPage.py b/gui/fcontextPage.py
similarity index 100%
rename from policycoreutils/gui/fcontextPage.py
rename to gui/fcontextPage.py
diff --git a/policycoreutils/gui/html_util.py b/gui/html_util.py
similarity index 100%
rename from policycoreutils/gui/html_util.py
rename to gui/html_util.py
diff --git a/policycoreutils/gui/loginsPage.py b/gui/loginsPage.py
similarity index 100%
rename from policycoreutils/gui/loginsPage.py
rename to gui/loginsPage.py
diff --git a/policycoreutils/gui/mappingsPage.py b/gui/mappingsPage.py
similarity index 100%
rename from policycoreutils/gui/mappingsPage.py
rename to gui/mappingsPage.py
diff --git a/policycoreutils/gui/modulesPage.py b/gui/modulesPage.py
similarity index 100%
rename from policycoreutils/gui/modulesPage.py
rename to gui/modulesPage.py
diff --git a/policycoreutils/gui/org.selinux.config.policy b/gui/org.selinux.config.policy
similarity index 100%
rename from policycoreutils/gui/org.selinux.config.policy
rename to gui/org.selinux.config.policy
diff --git a/policycoreutils/gui/polgen.glade b/gui/polgen.glade
similarity index 100%
rename from policycoreutils/gui/polgen.glade
rename to gui/polgen.glade
diff --git a/policycoreutils/gui/polgengui.py b/gui/polgengui.py
similarity index 100%
rename from policycoreutils/gui/polgengui.py
rename to gui/polgengui.py
diff --git a/policycoreutils/gui/portsPage.py b/gui/portsPage.py
similarity index 100%
rename from policycoreutils/gui/portsPage.py
rename to gui/portsPage.py
diff --git a/policycoreutils/gui/selinux-polgengui.8 b/gui/selinux-polgengui.8
similarity index 100%
rename from policycoreutils/gui/selinux-polgengui.8
rename to gui/selinux-polgengui.8
diff --git a/policycoreutils/gui/selinux-polgengui.desktop b/gui/selinux-polgengui.desktop
similarity index 100%
rename from policycoreutils/gui/selinux-polgengui.desktop
rename to gui/selinux-polgengui.desktop
diff --git a/policycoreutils/gui/semanagePage.py b/gui/semanagePage.py
similarity index 100%
rename from policycoreutils/gui/semanagePage.py
rename to gui/semanagePage.py
diff --git a/policycoreutils/gui/sepolgen b/gui/sepolgen
similarity index 100%
rename from policycoreutils/gui/sepolgen
rename to gui/sepolgen
diff --git a/policycoreutils/gui/statusPage.py b/gui/statusPage.py
similarity index 100%
rename from policycoreutils/gui/statusPage.py
rename to gui/statusPage.py
diff --git a/policycoreutils/gui/system-config-selinux b/gui/system-config-selinux
similarity index 100%
rename from policycoreutils/gui/system-config-selinux
rename to gui/system-config-selinux
diff --git a/policycoreutils/gui/system-config-selinux.8 b/gui/system-config-selinux.8
similarity index 100%
rename from policycoreutils/gui/system-config-selinux.8
rename to gui/system-config-selinux.8
diff --git a/policycoreutils/gui/system-config-selinux.desktop b/gui/system-config-selinux.desktop
similarity index 100%
rename from policycoreutils/gui/system-config-selinux.desktop
rename to gui/system-config-selinux.desktop
diff --git a/policycoreutils/gui/system-config-selinux.glade b/gui/system-config-selinux.glade
similarity index 100%
rename from policycoreutils/gui/system-config-selinux.glade
rename to gui/system-config-selinux.glade
diff --git a/policycoreutils/gui/system-config-selinux.png b/gui/system-config-selinux.png
similarity index 100%
rename from policycoreutils/gui/system-config-selinux.png
rename to gui/system-config-selinux.png
diff --git a/policycoreutils/gui/system-config-selinux.py b/gui/system-config-selinux.py
similarity index 100%
rename from policycoreutils/gui/system-config-selinux.py
rename to gui/system-config-selinux.py
diff --git a/policycoreutils/gui/usersPage.py b/gui/usersPage.py
similarity index 100%
rename from policycoreutils/gui/usersPage.py
rename to gui/usersPage.py
diff --git a/policycoreutils/Makefile b/policycoreutils/Makefile
index 962ac129..c9cccb8a 100644
--- a/policycoreutils/Makefile
+++ b/policycoreutils/Makefile
@@ -1,4 +1,4 @@
-SUBDIRS = sepolicy setfiles semanage load_policy newrole run_init sandbox secon audit2allow sestatus semodule_package semodule semodule_link semodule_expand semodule_deps sepolgen-ifgen setsebool scripts po man gui hll
+SUBDIRS = sepolicy setfiles semanage load_policy newrole run_init sandbox secon audit2allow sestatus semodule_package semodule semodule_link semodule_expand semodule_deps sepolgen-ifgen setsebool scripts po man hll
 
 INOTIFYH = $(shell ls /usr/include/sys/inotify.h 2>/dev/null)