diff --git a/Makefile b/Makefile
index 3de86a7..25dded5 100644
--- a/Makefile
+++ b/Makefile
@@ -89,9 +89,9 @@ RPMS = rpm/noarch/qubes-logos-$(QBSLOGOS_VERSION)-*.rpm \
 	rpm/x86_64/firstboot-$(FIRSTBOOT_VERSION)-*.rpm
 
 update-repo:
-	ln -f $(RPMS) build/yum/installer/rpm/
-	(cd build/yum && ./update_repo.sh)
+	ln -f $(RPMS) yum/installer/rpm/
+	(cd yum && ./update_repo.sh)
 
 iso:
-	ln -sf `pwd`/build /tmp/qubes-installer-workdir
+	ln -sf `pwd` /tmp/qubes-installer
 	revisor --cli --config=conf/qubes-install-respin.conf --model=qubes1-x86_64 --install-dvd
diff --git a/build/installer b/build/installer
deleted file mode 120000
index 88f057b..0000000
--- a/build/installer
+++ /dev/null
@@ -1 +0,0 @@
-/home/joanna/qubes/installer
\ No newline at end of file
diff --git a/conf/qubes-install-respin.conf b/conf/qubes-install-respin.conf
index 2a8e341..d069e64 100644
--- a/conf/qubes-install-respin.conf
+++ b/conf/qubes-install-respin.conf
@@ -13,7 +13,7 @@ dependency_resolve_allow_conflicts = 0
 mode_respin = 1
 
 kickstart_manifest = 1
-kickstart_file = /tmp/qubes-installer-workdir/installer/conf/qubes-1-respin.cfg
+kickstart_file = /tmp/qubes-installer/conf/qubes-1-respin.cfg
 kickstart_include = 0
 kickstart_default = 1
 
@@ -35,17 +35,15 @@ version = R1
 version_from = F13
 comps_filter = 0
 revisor_comps = 1
-comps = /tmp/qubes-installer-workdir/installer/conf/comps-qubes1.xml
+comps = /tmp/qubes-installer/conf/comps-qubes1.xml
 
-#isolinux_cfg = opt/qubes-installer/installer/conf/qubes-1_isolinux.cfg
-
-destination_directory = /tmp/qubes-installer-workdir/ISO
-working_directory = /tmp/qubes-installer-workdir/work
+destination_directory = /tmp/qubes-installer/build/ISO
+working_directory = /tmp/qubes-installer/build/work
 
 ## Models
 
 [qubes1-x86_64]
 description = Qubes R1 for x86_64
-main = /tmp/qubes-installer-workdir/installer/conf/qubes1-x86_64-respin.conf
+main = /tmp/qubes-installer/conf/qubes1-x86_64-respin.conf
 iso_basename = Qubes
 architecture = x86_64
diff --git a/conf/qubes1-x86_64-respin.conf b/conf/qubes1-x86_64-respin.conf
index babf38e..8d99183 100644
--- a/conf/qubes1-x86_64-respin.conf
+++ b/conf/qubes1-x86_64-respin.conf
@@ -13,15 +13,15 @@ obsoletes=1
 gpgcheck=0
 plugins=1
 metadata_expire=1800
-installroot=/tmp/qubes-installer-workdir/work/revisor
+installroot=/tmp/qubes-installer/build/work/revisor
 failovermethod=priority
 
 [fedora-local]
 name=Fedora 13 - x86_64 (local)
-baseurl=file:///tmp/qubes-installer-workdir/yum/fedora13-repo/
+baseurl=file:///tmp/qubes-installer/yum/fedora13-repo/
 enabled=1
 gpgcheck=1
-gpgkey=file:///tmp/qubes-installer-workdir/installer/keys/fedora-13.asc
+gpgkey=file:///tmp/qubes-installer/keys/fedora-13.asc
 cost=1
 
 [fedora]
@@ -30,22 +30,22 @@ baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/13/Everythin
 #mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-13&arch=x86_64
 enabled=1
 gpgcheck=1
-gpgkey=file:///tmp/qubes-installer-workdir/installer/keys/fedora-13.asc
+gpgkey=file:///tmp/qubes-installer/keys/fedora-13.asc
 cost=10
 
 
 [installer]
 name=Qubes Local Repository
-baseurl=file:///tmp/qubes-installer-workdir/yum/installer/
+baseurl=file:///tmp/qubes-installer/yum/installer/
 enabled=1
 gpgcheck=1
-gpgkey=file:///tmp/qubes-installer-workdir/installer/keys/qubes-release-1-signing-key.asc
+gpgkey=file:///tmp/qubes-installer/keys/qubes-release-1-signing-key.asc
 cost=1
 
 [qubes-dom0]
 name=Qubes Local Repository
-baseurl=file:///tmp/qubes-installer-workdir/yum/qubes-dom0/
+baseurl=file:///tmp/qubes-installer/yum/qubes-dom0/
 enabled=1
 gpgcheck=1
-gpgkey=file:///tmp/qubes-installer-workdir/installer/keys/qubes-release-1-signing-key.asc
+gpgkey=file:///tmp/qubes-installer/keys/qubes-release-1-signing-key.asc
 cost=1
diff --git a/build/yum/dom0-updates/repodata/.gitignore b/yum/dom0-updates/repodata/.gitignore
similarity index 100%
rename from build/yum/dom0-updates/repodata/.gitignore
rename to yum/dom0-updates/repodata/.gitignore
diff --git a/build/yum/dom0-updates/rpm/.gitignore b/yum/dom0-updates/rpm/.gitignore
similarity index 100%
rename from build/yum/dom0-updates/rpm/.gitignore
rename to yum/dom0-updates/rpm/.gitignore
diff --git a/build/yum/fedora13-repo/.gitignore b/yum/fedora13-repo/.gitignore
similarity index 100%
rename from build/yum/fedora13-repo/.gitignore
rename to yum/fedora13-repo/.gitignore
diff --git a/build/yum/installer/repodata/.gitignore b/yum/installer/repodata/.gitignore
similarity index 100%
rename from build/yum/installer/repodata/.gitignore
rename to yum/installer/repodata/.gitignore
diff --git a/build/yum/installer/rpm/.gitignore b/yum/installer/rpm/.gitignore
similarity index 100%
rename from build/yum/installer/rpm/.gitignore
rename to yum/installer/rpm/.gitignore
diff --git a/build/yum/qubes-dom0/repodata/.gitignore b/yum/qubes-dom0/repodata/.gitignore
similarity index 100%
rename from build/yum/qubes-dom0/repodata/.gitignore
rename to yum/qubes-dom0/repodata/.gitignore
diff --git a/build/yum/qubes-dom0/rpm/.gitignore b/yum/qubes-dom0/rpm/.gitignore
similarity index 100%
rename from build/yum/qubes-dom0/rpm/.gitignore
rename to yum/qubes-dom0/rpm/.gitignore
diff --git a/build/yum/update_repo.sh b/yum/update_repo.sh
similarity index 100%
rename from build/yum/update_repo.sh
rename to yum/update_repo.sh