diff --git a/alterator/Makefile b/alterator/Makefile
deleted file mode 100644
index dcc5941..0000000
--- a/alterator/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-all:
-	rcc-qt4 -binary theme.qrc -o theme.rcc
diff --git a/components.mk b/components.mk
index b2ce475..be11c12 100644
--- a/components.mk
+++ b/components.mk
@@ -1,11 +1,11 @@
 # browser-qt
 
-alterator/design/bg.png: images/installer.png
+components/browser-qt/design/bg.png: images/installer.png
 	convert $< -resize '800x600!' -fill '#c62530' -font /usr/share/fonts/ttf/dejavu/DejaVuSansCondensed-Bold.ttf -style Normal -weight Normal -pointsize 20 -gravity northeast -draw 'text 25,25 "$(STATUS)"' $@
 
-browser-qt:alterator/design/bg.png
+browser-qt:components/browser-qt/design/bg.png
 	install -d $(datadir)/alterator-browser-qt/design
-	cd alterator; rcc-qt4 -binary theme.qrc -o $(datadir)/alterator-browser-qt/design/$(THEME).rcc; cd -
+	cd components/browser-qt; rcc-qt4 -binary theme.qrc -o $(datadir)/alterator-browser-qt/design/$(THEME).rcc; cd -
 	install -d $(sysconfdir)/alternatives/packages.d
 	printf '/etc/alterator/design-browser-qt\t/usr/share/alterator-browser-qt/design/$(THEME).rcc\t50\n'>$(sysconfdir)/alternatives/packages.d/$(THEME).rcc
 
@@ -13,6 +13,6 @@ browser-qt:alterator/design/bg.png
 
 ahttpd:
 	install -d $(datadir)/alterator/design/styles
-	cp -a alterator/images $(datadir)/alterator/design
+	cp -a components/ahttpd/images $(datadir)/alterator/design
 	[ ! -f images/logo.png ] || convert images/logo.png -fill '#ffffff' -font /usr/share/fonts/ttf/dejavu/DejaVuSans-Bold.ttf -style Normal -weight Normal -pointsize 24 -gravity northwest -draw 'text 0,0 "$(VERSION) $(NAME)"' $(datadir)/alterator/design/images/logo.png
-	cp -a alterator/styles/*.css $(datadir)/alterator/design/styles
+	cp -a components/ahttpd/styles/*.css $(datadir)/alterator/design/styles
diff --git a/alterator/images/asc-desc.gif b/components/ahttpd/images/asc-desc.gif
similarity index 100%
rename from alterator/images/asc-desc.gif
rename to components/ahttpd/images/asc-desc.gif
diff --git a/alterator/images/asc.gif b/components/ahttpd/images/asc.gif
similarity index 100%
rename from alterator/images/asc.gif
rename to components/ahttpd/images/asc.gif
diff --git a/alterator/images/background.png b/components/ahttpd/images/background.png
similarity index 100%
rename from alterator/images/background.png
rename to components/ahttpd/images/background.png
diff --git a/alterator/images/bg.jpg b/components/ahttpd/images/bg.jpg
similarity index 100%
rename from alterator/images/bg.jpg
rename to components/ahttpd/images/bg.jpg
diff --git a/alterator/images/desc.gif b/components/ahttpd/images/desc.gif
similarity index 100%
rename from alterator/images/desc.gif
rename to components/ahttpd/images/desc.gif
diff --git a/alterator/images/gradient-menu.png b/components/ahttpd/images/gradient-menu.png
similarity index 100%
rename from alterator/images/gradient-menu.png
rename to components/ahttpd/images/gradient-menu.png
diff --git a/alterator/images/gradient-top.png b/components/ahttpd/images/gradient-top.png
similarity index 100%
rename from alterator/images/gradient-top.png
rename to components/ahttpd/images/gradient-top.png
diff --git a/alterator/images/gradient.png b/components/ahttpd/images/gradient.png
similarity index 100%
rename from alterator/images/gradient.png
rename to components/ahttpd/images/gradient.png
diff --git a/alterator/images/groups/datetime.png b/components/ahttpd/images/groups/datetime.png
similarity index 100%
rename from alterator/images/groups/datetime.png
rename to components/ahttpd/images/groups/datetime.png
diff --git a/alterator/images/groups/mail.png b/components/ahttpd/images/groups/mail.png
similarity index 100%
rename from alterator/images/groups/mail.png
rename to components/ahttpd/images/groups/mail.png
diff --git a/alterator/images/groups/network.png b/components/ahttpd/images/groups/network.png
similarity index 100%
rename from alterator/images/groups/network.png
rename to components/ahttpd/images/groups/network.png
diff --git a/alterator/images/groups/pkg.png b/components/ahttpd/images/groups/pkg.png
similarity index 100%
rename from alterator/images/groups/pkg.png
rename to components/ahttpd/images/groups/pkg.png
diff --git a/alterator/images/groups/servers.png b/components/ahttpd/images/groups/servers.png
similarity index 100%
rename from alterator/images/groups/servers.png
rename to components/ahttpd/images/groups/servers.png
diff --git a/alterator/images/groups/system.png b/components/ahttpd/images/groups/system.png
similarity index 100%
rename from alterator/images/groups/system.png
rename to components/ahttpd/images/groups/system.png
diff --git a/alterator/images/groups/users.png b/components/ahttpd/images/groups/users.png
similarity index 100%
rename from alterator/images/groups/users.png
rename to components/ahttpd/images/groups/users.png
diff --git a/alterator/images/groups/xorg.png b/components/ahttpd/images/groups/xorg.png
similarity index 100%
rename from alterator/images/groups/xorg.png
rename to components/ahttpd/images/groups/xorg.png
diff --git a/alterator/images/help.png b/components/ahttpd/images/help.png
similarity index 100%
rename from alterator/images/help.png
rename to components/ahttpd/images/help.png
diff --git a/alterator/images/hgrabber.gif b/components/ahttpd/images/hgrabber.gif
similarity index 100%
rename from alterator/images/hgrabber.gif
rename to components/ahttpd/images/hgrabber.gif
diff --git a/alterator/images/information.gif b/components/ahttpd/images/information.gif
similarity index 100%
rename from alterator/images/information.gif
rename to components/ahttpd/images/information.gif
diff --git a/alterator/images/off.png b/components/ahttpd/images/off.png
similarity index 100%
rename from alterator/images/off.png
rename to components/ahttpd/images/off.png
diff --git a/alterator/images/on.png b/components/ahttpd/images/on.png
similarity index 100%
rename from alterator/images/on.png
rename to components/ahttpd/images/on.png
diff --git a/alterator/images/steps/datetime.png b/components/ahttpd/images/steps/datetime.png
similarity index 100%
rename from alterator/images/steps/datetime.png
rename to components/ahttpd/images/steps/datetime.png
diff --git a/alterator/images/steps/install2-basesystem.png b/components/ahttpd/images/steps/install2-basesystem.png
similarity index 100%
rename from alterator/images/steps/install2-basesystem.png
rename to components/ahttpd/images/steps/install2-basesystem.png
diff --git a/alterator/images/steps/install2-preinstall.png b/components/ahttpd/images/steps/install2-preinstall.png
similarity index 100%
rename from alterator/images/steps/install2-preinstall.png
rename to components/ahttpd/images/steps/install2-preinstall.png
diff --git a/alterator/images/steps/lilo.png b/components/ahttpd/images/steps/lilo.png
similarity index 100%
rename from alterator/images/steps/lilo.png
rename to components/ahttpd/images/steps/lilo.png
diff --git a/alterator/images/steps/net-eth.png b/components/ahttpd/images/steps/net-eth.png
similarity index 100%
rename from alterator/images/steps/net-eth.png
rename to components/ahttpd/images/steps/net-eth.png
diff --git a/alterator/images/steps/notes-license.png b/components/ahttpd/images/steps/notes-license.png
similarity index 100%
rename from alterator/images/steps/notes-license.png
rename to components/ahttpd/images/steps/notes-license.png
diff --git a/alterator/images/steps/notes-release-notes.png b/components/ahttpd/images/steps/notes-release-notes.png
similarity index 100%
rename from alterator/images/steps/notes-release-notes.png
rename to components/ahttpd/images/steps/notes-release-notes.png
diff --git a/alterator/images/steps/pkg-groups.png b/components/ahttpd/images/steps/pkg-groups.png
similarity index 100%
rename from alterator/images/steps/pkg-groups.png
rename to components/ahttpd/images/steps/pkg-groups.png
diff --git a/alterator/images/steps/preinstall.png b/components/ahttpd/images/steps/preinstall.png
similarity index 100%
rename from alterator/images/steps/preinstall.png
rename to components/ahttpd/images/steps/preinstall.png
diff --git a/alterator/images/steps/root.png b/components/ahttpd/images/steps/root.png
similarity index 100%
rename from alterator/images/steps/root.png
rename to components/ahttpd/images/steps/root.png
diff --git a/alterator/images/steps/sysconfig-base.png b/components/ahttpd/images/steps/sysconfig-base.png
similarity index 100%
rename from alterator/images/steps/sysconfig-base.png
rename to components/ahttpd/images/steps/sysconfig-base.png
diff --git a/alterator/images/steps/sysconfig-kbd.png b/components/ahttpd/images/steps/sysconfig-kbd.png
similarity index 100%
rename from alterator/images/steps/sysconfig-kbd.png
rename to components/ahttpd/images/steps/sysconfig-kbd.png
diff --git a/alterator/images/steps/sysconfig-language.png b/components/ahttpd/images/steps/sysconfig-language.png
similarity index 100%
rename from alterator/images/steps/sysconfig-language.png
rename to components/ahttpd/images/steps/sysconfig-language.png
diff --git a/alterator/images/steps/timezone.png b/components/ahttpd/images/steps/timezone.png
similarity index 100%
rename from alterator/images/steps/timezone.png
rename to components/ahttpd/images/steps/timezone.png
diff --git a/alterator/images/steps/users.png b/components/ahttpd/images/steps/users.png
similarity index 100%
rename from alterator/images/steps/users.png
rename to components/ahttpd/images/steps/users.png
diff --git a/alterator/images/steps/vm.png b/components/ahttpd/images/steps/vm.png
similarity index 100%
rename from alterator/images/steps/vm.png
rename to components/ahttpd/images/steps/vm.png
diff --git a/alterator/images/steps/x11.png b/components/ahttpd/images/steps/x11.png
similarity index 100%
rename from alterator/images/steps/x11.png
rename to components/ahttpd/images/steps/x11.png
diff --git a/alterator/styles/alterator.css.in b/components/ahttpd/styles/alterator.css.in
similarity index 100%
rename from alterator/styles/alterator.css.in
rename to components/ahttpd/styles/alterator.css.in
diff --git a/alterator/design/backward.png b/components/browser-qt/design/backward.png
similarity index 100%
rename from alterator/design/backward.png
rename to components/browser-qt/design/backward.png
diff --git a/alterator/design/design.ini.in b/components/browser-qt/design/design.ini.in
similarity index 100%
rename from alterator/design/design.ini.in
rename to components/browser-qt/design/design.ini.in
diff --git a/alterator/design/design.qss.in b/components/browser-qt/design/design.qss.in
similarity index 100%
rename from alterator/design/design.qss.in
rename to components/browser-qt/design/design.qss.in
diff --git a/alterator/design/forward.png b/components/browser-qt/design/forward.png
similarity index 100%
rename from alterator/design/forward.png
rename to components/browser-qt/design/forward.png
diff --git a/alterator/theme.qrc b/components/browser-qt/theme.qrc
similarity index 100%
rename from alterator/theme.qrc
rename to components/browser-qt/theme.qrc