diff --git a/kojihub/Makefile b/kojihub/Makefile
index 1c7010d1..db9310aa 100644
--- a/kojihub/Makefile
+++ b/kojihub/Makefile
@@ -1,6 +1,6 @@
 PYVER_MAJOR := $(shell $(PYTHON) -c 'import sys; print(".".join(sys.version.split(".")[:1]))')
 PACKAGE = kojihub
-PYFILES = $(filter-out kojiapp.py, $(wildcard *.py))
+PYFILES = $(wildcard *.py)
 PKGDIR = $(shell $(PYTHON) -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")/$(PACKAGE)
 
 SERVERDIR = /usr/share/koji-hub
@@ -19,13 +19,7 @@ install:
 		exit 1; \
 	fi
 
-	mkdir -p $(DESTDIR)/etc/httpd/conf.d
-	install -p -m 644 httpd.conf $(DESTDIR)/etc/httpd/conf.d/kojihub.conf
-
-	mkdir -p $(DESTDIR)/etc/koji-hub
-	install -p -m 644 hub.conf $(DESTDIR)/etc/koji-hub/hub.conf
-	mkdir -p $(DESTDIR)/etc/koji-hub/hub.conf.d
-
+        # python module
 	mkdir -p $(DESTDIR)/$(PKGDIR)
 	for p in $(PYFILES) ; do \
 		install -p -m 644 $$p $(DESTDIR)/$(PKGDIR)/$$p; \
@@ -33,6 +27,15 @@ install:
 
 	$(PYTHON) -c "import compileall; compileall.compile_dir('$(DESTDIR)/$(PKGDIR)', 1, '$(PYDIR)', 1)"
 
+        # application files
+	mkdir -p $(DESTDIR)/etc/httpd/conf.d
+	install -p -m 644 app/httpd.conf $(DESTDIR)/etc/httpd/conf.d/kojihub.conf
+
+	mkdir -p $(DESTDIR)/etc/koji-hub
+	install -p -m 644 app/hub.conf $(DESTDIR)/etc/koji-hub/hub.conf
+	mkdir -p $(DESTDIR)/etc/koji-hub/hub.conf.d
+
+
 	mkdir -p $(DESTDIR)/$(SERVERDIR)
-	install -p -m 644 kojiapp.py $(DESTDIR)/$(SERVERDIR)/kojiapp.py
+	install -p -m 644 app/kojiapp.py $(DESTDIR)/$(SERVERDIR)/kojiapp.py
 	$(PYTHON) -c "import compileall; compileall.compile_dir('$(DESTDIR)/$(SERVERDIR)', 1, '$(PYDIR)', 1)"
diff --git a/kojihub/httpd.conf b/kojihub/app/httpd.conf
similarity index 100%
rename from kojihub/httpd.conf
rename to kojihub/app/httpd.conf
diff --git a/kojihub/hub.conf b/kojihub/app/hub.conf
similarity index 100%
rename from kojihub/hub.conf
rename to kojihub/app/hub.conf
diff --git a/kojihub/kojiapp.py b/kojihub/app/kojiapp.py
similarity index 100%
rename from kojihub/kojiapp.py
rename to kojihub/app/kojiapp.py