diff --git a/src/HydraFrontend/Makefile.PL b/src/Hydra/Makefile.PL
similarity index 100%
rename from src/HydraFrontend/Makefile.PL
rename to src/Hydra/Makefile.PL
diff --git a/src/HydraFrontend/hydrafrontend.conf b/src/Hydra/hydrafrontend.conf
similarity index 100%
rename from src/HydraFrontend/hydrafrontend.conf
rename to src/Hydra/hydrafrontend.conf
diff --git a/src/HydraFrontend/lib/HydraFrontend.pm b/src/Hydra/lib/HydraFrontend.pm
similarity index 100%
rename from src/HydraFrontend/lib/HydraFrontend.pm
rename to src/Hydra/lib/HydraFrontend.pm
diff --git a/src/HydraFrontend/lib/HydraFrontend/Controller/Root.pm b/src/Hydra/lib/HydraFrontend/Controller/Root.pm
similarity index 100%
rename from src/HydraFrontend/lib/HydraFrontend/Controller/Root.pm
rename to src/Hydra/lib/HydraFrontend/Controller/Root.pm
diff --git a/src/HydraFrontend/lib/HydraFrontend/Helper/Nix.pm b/src/Hydra/lib/HydraFrontend/Helper/Nix.pm
similarity index 100%
rename from src/HydraFrontend/lib/HydraFrontend/Helper/Nix.pm
rename to src/Hydra/lib/HydraFrontend/Helper/Nix.pm
diff --git a/src/HydraFrontend/lib/HydraFrontend/Model/DB.pm b/src/Hydra/lib/HydraFrontend/Model/DB.pm
similarity index 100%
rename from src/HydraFrontend/lib/HydraFrontend/Model/DB.pm
rename to src/Hydra/lib/HydraFrontend/Model/DB.pm
diff --git a/src/HydraFrontend/lib/HydraFrontend/Schema.pm b/src/Hydra/lib/HydraFrontend/Schema.pm
similarity index 100%
rename from src/HydraFrontend/lib/HydraFrontend/Schema.pm
rename to src/Hydra/lib/HydraFrontend/Schema.pm
diff --git a/src/HydraFrontend/lib/HydraFrontend/Schema/Buildinputs.pm b/src/Hydra/lib/HydraFrontend/Schema/Buildinputs.pm
similarity index 100%
rename from src/HydraFrontend/lib/HydraFrontend/Schema/Buildinputs.pm
rename to src/Hydra/lib/HydraFrontend/Schema/Buildinputs.pm
diff --git a/src/HydraFrontend/lib/HydraFrontend/Schema/Buildproducts.pm b/src/Hydra/lib/HydraFrontend/Schema/Buildproducts.pm
similarity index 100%
rename from src/HydraFrontend/lib/HydraFrontend/Schema/Buildproducts.pm
rename to src/Hydra/lib/HydraFrontend/Schema/Buildproducts.pm
diff --git a/src/HydraFrontend/lib/HydraFrontend/Schema/Buildresultinfo.pm b/src/Hydra/lib/HydraFrontend/Schema/Buildresultinfo.pm
similarity index 100%
rename from src/HydraFrontend/lib/HydraFrontend/Schema/Buildresultinfo.pm
rename to src/Hydra/lib/HydraFrontend/Schema/Buildresultinfo.pm
diff --git a/src/HydraFrontend/lib/HydraFrontend/Schema/Builds.pm b/src/Hydra/lib/HydraFrontend/Schema/Builds.pm
similarity index 100%
rename from src/HydraFrontend/lib/HydraFrontend/Schema/Builds.pm
rename to src/Hydra/lib/HydraFrontend/Schema/Builds.pm
diff --git a/src/HydraFrontend/lib/HydraFrontend/Schema/Buildschedulinginfo.pm b/src/Hydra/lib/HydraFrontend/Schema/Buildschedulinginfo.pm
similarity index 100%
rename from src/HydraFrontend/lib/HydraFrontend/Schema/Buildschedulinginfo.pm
rename to src/Hydra/lib/HydraFrontend/Schema/Buildschedulinginfo.pm
diff --git a/src/HydraFrontend/lib/HydraFrontend/Schema/Buildsteps.pm b/src/Hydra/lib/HydraFrontend/Schema/Buildsteps.pm
similarity index 100%
rename from src/HydraFrontend/lib/HydraFrontend/Schema/Buildsteps.pm
rename to src/Hydra/lib/HydraFrontend/Schema/Buildsteps.pm
diff --git a/src/HydraFrontend/lib/HydraFrontend/Schema/Jobsetinputalts.pm b/src/Hydra/lib/HydraFrontend/Schema/Jobsetinputalts.pm
similarity index 100%
rename from src/HydraFrontend/lib/HydraFrontend/Schema/Jobsetinputalts.pm
rename to src/Hydra/lib/HydraFrontend/Schema/Jobsetinputalts.pm
diff --git a/src/HydraFrontend/lib/HydraFrontend/Schema/Jobsetinputs.pm b/src/Hydra/lib/HydraFrontend/Schema/Jobsetinputs.pm
similarity index 100%
rename from src/HydraFrontend/lib/HydraFrontend/Schema/Jobsetinputs.pm
rename to src/Hydra/lib/HydraFrontend/Schema/Jobsetinputs.pm
diff --git a/src/HydraFrontend/lib/HydraFrontend/Schema/Jobsets.pm b/src/Hydra/lib/HydraFrontend/Schema/Jobsets.pm
similarity index 100%
rename from src/HydraFrontend/lib/HydraFrontend/Schema/Jobsets.pm
rename to src/Hydra/lib/HydraFrontend/Schema/Jobsets.pm
diff --git a/src/HydraFrontend/lib/HydraFrontend/Schema/Projects.pm b/src/Hydra/lib/HydraFrontend/Schema/Projects.pm
similarity index 100%
rename from src/HydraFrontend/lib/HydraFrontend/Schema/Projects.pm
rename to src/Hydra/lib/HydraFrontend/Schema/Projects.pm
diff --git a/src/HydraFrontend/lib/HydraFrontend/View/NixClosure.pm b/src/Hydra/lib/HydraFrontend/View/NixClosure.pm
similarity index 100%
rename from src/HydraFrontend/lib/HydraFrontend/View/NixClosure.pm
rename to src/Hydra/lib/HydraFrontend/View/NixClosure.pm
diff --git a/src/HydraFrontend/lib/HydraFrontend/View/TT.pm b/src/Hydra/lib/HydraFrontend/View/TT.pm
similarity index 100%
rename from src/HydraFrontend/lib/HydraFrontend/View/TT.pm
rename to src/Hydra/lib/HydraFrontend/View/TT.pm
diff --git a/src/HydraFrontend/root/build.tt b/src/Hydra/root/build.tt
similarity index 100%
rename from src/HydraFrontend/root/build.tt
rename to src/Hydra/root/build.tt
diff --git a/src/HydraFrontend/root/common.tt b/src/Hydra/root/common.tt
similarity index 100%
rename from src/HydraFrontend/root/common.tt
rename to src/Hydra/root/common.tt
diff --git a/src/HydraFrontend/root/error.tt b/src/Hydra/root/error.tt
similarity index 100%
rename from src/HydraFrontend/root/error.tt
rename to src/Hydra/root/error.tt
diff --git a/src/HydraFrontend/root/index.tt b/src/Hydra/root/index.tt
similarity index 100%
rename from src/HydraFrontend/root/index.tt
rename to src/Hydra/root/index.tt
diff --git a/src/HydraFrontend/root/job.tt b/src/Hydra/root/job.tt
similarity index 100%
rename from src/HydraFrontend/root/job.tt
rename to src/Hydra/root/job.tt
diff --git a/src/HydraFrontend/root/layout.tt b/src/Hydra/root/layout.tt
similarity index 100%
rename from src/HydraFrontend/root/layout.tt
rename to src/Hydra/root/layout.tt
diff --git a/src/HydraFrontend/root/log.tt b/src/Hydra/root/log.tt
similarity index 100%
rename from src/HydraFrontend/root/log.tt
rename to src/Hydra/root/log.tt
diff --git a/src/HydraFrontend/root/project.tt b/src/Hydra/root/project.tt
similarity index 100%
rename from src/HydraFrontend/root/project.tt
rename to src/Hydra/root/project.tt
diff --git a/src/HydraFrontend/root/short-build-info.tt b/src/Hydra/root/short-build-info.tt
similarity index 100%
rename from src/HydraFrontend/root/short-build-info.tt
rename to src/Hydra/root/short-build-info.tt
diff --git a/src/HydraFrontend/root/static/css/hydra.css b/src/Hydra/root/static/css/hydra.css
similarity index 100%
rename from src/HydraFrontend/root/static/css/hydra.css
rename to src/Hydra/root/static/css/hydra.css
diff --git a/src/HydraFrontend/root/static/css/logfile.css b/src/Hydra/root/static/css/logfile.css
similarity index 100%
rename from src/HydraFrontend/root/static/css/logfile.css
rename to src/Hydra/root/static/css/logfile.css
diff --git a/src/HydraFrontend/root/static/images/arrow-right-active.gif b/src/Hydra/root/static/images/arrow-right-active.gif
similarity index 100%
rename from src/HydraFrontend/root/static/images/arrow-right-active.gif
rename to src/Hydra/root/static/images/arrow-right-active.gif
diff --git a/src/HydraFrontend/root/static/images/arrow-right.gif b/src/Hydra/root/static/images/arrow-right.gif
similarity index 100%
rename from src/HydraFrontend/root/static/images/arrow-right.gif
rename to src/Hydra/root/static/images/arrow-right.gif
diff --git a/src/HydraFrontend/root/static/images/debian.png b/src/Hydra/root/static/images/debian.png
similarity index 100%
rename from src/HydraFrontend/root/static/images/debian.png
rename to src/Hydra/root/static/images/debian.png
diff --git a/src/HydraFrontend/root/static/images/document.png b/src/Hydra/root/static/images/document.png
similarity index 100%
rename from src/HydraFrontend/root/static/images/document.png
rename to src/Hydra/root/static/images/document.png
diff --git a/src/HydraFrontend/root/static/images/failure.gif b/src/Hydra/root/static/images/failure.gif
similarity index 100%
rename from src/HydraFrontend/root/static/images/failure.gif
rename to src/Hydra/root/static/images/failure.gif
diff --git a/src/HydraFrontend/root/static/images/nix-build.png b/src/Hydra/root/static/images/nix-build.png
similarity index 100%
rename from src/HydraFrontend/root/static/images/nix-build.png
rename to src/Hydra/root/static/images/nix-build.png
diff --git a/src/HydraFrontend/root/static/images/report.png b/src/Hydra/root/static/images/report.png
similarity index 100%
rename from src/HydraFrontend/root/static/images/report.png
rename to src/Hydra/root/static/images/report.png
diff --git a/src/HydraFrontend/root/static/images/rpm-fedora.png b/src/Hydra/root/static/images/rpm-fedora.png
similarity index 100%
rename from src/HydraFrontend/root/static/images/rpm-fedora.png
rename to src/Hydra/root/static/images/rpm-fedora.png
diff --git a/src/HydraFrontend/root/static/images/rpm.png b/src/Hydra/root/static/images/rpm.png
similarity index 100%
rename from src/HydraFrontend/root/static/images/rpm.png
rename to src/Hydra/root/static/images/rpm.png
diff --git a/src/HydraFrontend/root/static/images/source-dist.png b/src/Hydra/root/static/images/source-dist.png
similarity index 100%
rename from src/HydraFrontend/root/static/images/source-dist.png
rename to src/Hydra/root/static/images/source-dist.png
diff --git a/src/HydraFrontend/root/static/images/success.gif b/src/Hydra/root/static/images/success.gif
similarity index 100%
rename from src/HydraFrontend/root/static/images/success.gif
rename to src/Hydra/root/static/images/success.gif
diff --git a/src/HydraFrontend/script/hydrafrontend_cgi.pl b/src/Hydra/script/hydrafrontend_cgi.pl
similarity index 100%
rename from src/HydraFrontend/script/hydrafrontend_cgi.pl
rename to src/Hydra/script/hydrafrontend_cgi.pl
diff --git a/src/HydraFrontend/script/hydrafrontend_create.pl b/src/Hydra/script/hydrafrontend_create.pl
similarity index 100%
rename from src/HydraFrontend/script/hydrafrontend_create.pl
rename to src/Hydra/script/hydrafrontend_create.pl
diff --git a/src/HydraFrontend/script/hydrafrontend_fastcgi.pl b/src/Hydra/script/hydrafrontend_fastcgi.pl
similarity index 100%
rename from src/HydraFrontend/script/hydrafrontend_fastcgi.pl
rename to src/Hydra/script/hydrafrontend_fastcgi.pl
diff --git a/src/HydraFrontend/script/hydrafrontend_server.pl b/src/Hydra/script/hydrafrontend_server.pl
similarity index 100%
rename from src/HydraFrontend/script/hydrafrontend_server.pl
rename to src/Hydra/script/hydrafrontend_server.pl
diff --git a/src/HydraFrontend/script/hydrafrontend_test.pl b/src/Hydra/script/hydrafrontend_test.pl
similarity index 100%
rename from src/HydraFrontend/script/hydrafrontend_test.pl
rename to src/Hydra/script/hydrafrontend_test.pl
diff --git a/src/HydraFrontend/xsl/log2html.xsl b/src/Hydra/xsl/log2html.xsl
similarity index 100%
rename from src/HydraFrontend/xsl/log2html.xsl
rename to src/Hydra/xsl/log2html.xsl
diff --git a/src/HydraFrontend/xsl/mark-errors.xsl b/src/Hydra/xsl/mark-errors.xsl
similarity index 100%
rename from src/HydraFrontend/xsl/mark-errors.xsl
rename to src/Hydra/xsl/mark-errors.xsl