diff --git a/src/Hydra/hydrafrontend.conf b/src/Hydra/hydra.conf
similarity index 100%
rename from src/Hydra/hydrafrontend.conf
rename to src/Hydra/hydra.conf
diff --git a/src/Hydra/lib/HydraFrontend/Controller/Root.pm b/src/Hydra/lib/Hydra/Controller/Root.pm
similarity index 100%
rename from src/Hydra/lib/HydraFrontend/Controller/Root.pm
rename to src/Hydra/lib/Hydra/Controller/Root.pm
diff --git a/src/Hydra/lib/HydraFrontend/Helper/Nix.pm b/src/Hydra/lib/Hydra/Helper/Nix.pm
similarity index 100%
rename from src/Hydra/lib/HydraFrontend/Helper/Nix.pm
rename to src/Hydra/lib/Hydra/Helper/Nix.pm
diff --git a/src/Hydra/lib/HydraFrontend/Model/DB.pm b/src/Hydra/lib/Hydra/Model/DB.pm
similarity index 100%
rename from src/Hydra/lib/HydraFrontend/Model/DB.pm
rename to src/Hydra/lib/Hydra/Model/DB.pm
diff --git a/src/Hydra/lib/HydraFrontend/Schema.pm b/src/Hydra/lib/Hydra/Schema.pm
similarity index 100%
rename from src/Hydra/lib/HydraFrontend/Schema.pm
rename to src/Hydra/lib/Hydra/Schema.pm
diff --git a/src/Hydra/lib/HydraFrontend/Schema/Buildinputs.pm b/src/Hydra/lib/Hydra/Schema/Buildinputs.pm
similarity index 100%
rename from src/Hydra/lib/HydraFrontend/Schema/Buildinputs.pm
rename to src/Hydra/lib/Hydra/Schema/Buildinputs.pm
diff --git a/src/Hydra/lib/HydraFrontend/Schema/Buildproducts.pm b/src/Hydra/lib/Hydra/Schema/Buildproducts.pm
similarity index 100%
rename from src/Hydra/lib/HydraFrontend/Schema/Buildproducts.pm
rename to src/Hydra/lib/Hydra/Schema/Buildproducts.pm
diff --git a/src/Hydra/lib/HydraFrontend/Schema/Buildresultinfo.pm b/src/Hydra/lib/Hydra/Schema/Buildresultinfo.pm
similarity index 100%
rename from src/Hydra/lib/HydraFrontend/Schema/Buildresultinfo.pm
rename to src/Hydra/lib/Hydra/Schema/Buildresultinfo.pm
diff --git a/src/Hydra/lib/HydraFrontend/Schema/Builds.pm b/src/Hydra/lib/Hydra/Schema/Builds.pm
similarity index 100%
rename from src/Hydra/lib/HydraFrontend/Schema/Builds.pm
rename to src/Hydra/lib/Hydra/Schema/Builds.pm
diff --git a/src/Hydra/lib/HydraFrontend/Schema/Buildschedulinginfo.pm b/src/Hydra/lib/Hydra/Schema/Buildschedulinginfo.pm
similarity index 100%
rename from src/Hydra/lib/HydraFrontend/Schema/Buildschedulinginfo.pm
rename to src/Hydra/lib/Hydra/Schema/Buildschedulinginfo.pm
diff --git a/src/Hydra/lib/HydraFrontend/Schema/Buildsteps.pm b/src/Hydra/lib/Hydra/Schema/Buildsteps.pm
similarity index 100%
rename from src/Hydra/lib/HydraFrontend/Schema/Buildsteps.pm
rename to src/Hydra/lib/Hydra/Schema/Buildsteps.pm
diff --git a/src/Hydra/lib/HydraFrontend/Schema/Jobsetinputalts.pm b/src/Hydra/lib/Hydra/Schema/Jobsetinputalts.pm
similarity index 100%
rename from src/Hydra/lib/HydraFrontend/Schema/Jobsetinputalts.pm
rename to src/Hydra/lib/Hydra/Schema/Jobsetinputalts.pm
diff --git a/src/Hydra/lib/HydraFrontend/Schema/Jobsetinputs.pm b/src/Hydra/lib/Hydra/Schema/Jobsetinputs.pm
similarity index 100%
rename from src/Hydra/lib/HydraFrontend/Schema/Jobsetinputs.pm
rename to src/Hydra/lib/Hydra/Schema/Jobsetinputs.pm
diff --git a/src/Hydra/lib/HydraFrontend/Schema/Jobsets.pm b/src/Hydra/lib/Hydra/Schema/Jobsets.pm
similarity index 100%
rename from src/Hydra/lib/HydraFrontend/Schema/Jobsets.pm
rename to src/Hydra/lib/Hydra/Schema/Jobsets.pm
diff --git a/src/Hydra/lib/HydraFrontend/Schema/Projects.pm b/src/Hydra/lib/Hydra/Schema/Projects.pm
similarity index 100%
rename from src/Hydra/lib/HydraFrontend/Schema/Projects.pm
rename to src/Hydra/lib/Hydra/Schema/Projects.pm
diff --git a/src/Hydra/lib/HydraFrontend/View/NixClosure.pm b/src/Hydra/lib/Hydra/View/NixClosure.pm
similarity index 100%
rename from src/Hydra/lib/HydraFrontend/View/NixClosure.pm
rename to src/Hydra/lib/Hydra/View/NixClosure.pm
diff --git a/src/Hydra/lib/HydraFrontend/View/TT.pm b/src/Hydra/lib/Hydra/View/TT.pm
similarity index 100%
rename from src/Hydra/lib/HydraFrontend/View/TT.pm
rename to src/Hydra/lib/Hydra/View/TT.pm
diff --git a/src/Hydra/script/hydrafrontend_cgi.pl b/src/Hydra/script/hydra_cgi.pl
similarity index 100%
rename from src/Hydra/script/hydrafrontend_cgi.pl
rename to src/Hydra/script/hydra_cgi.pl
diff --git a/src/Hydra/script/hydrafrontend_create.pl b/src/Hydra/script/hydra_create.pl
similarity index 100%
rename from src/Hydra/script/hydrafrontend_create.pl
rename to src/Hydra/script/hydra_create.pl
diff --git a/src/Hydra/script/hydrafrontend_fastcgi.pl b/src/Hydra/script/hydra_fastcgi.pl
similarity index 100%
rename from src/Hydra/script/hydrafrontend_fastcgi.pl
rename to src/Hydra/script/hydra_fastcgi.pl
diff --git a/src/Hydra/script/hydrafrontend_server.pl b/src/Hydra/script/hydra_server.pl
similarity index 100%
rename from src/Hydra/script/hydrafrontend_server.pl
rename to src/Hydra/script/hydra_server.pl
diff --git a/src/Hydra/script/hydrafrontend_test.pl b/src/Hydra/script/hydra_test.pl
similarity index 100%
rename from src/Hydra/script/hydrafrontend_test.pl
rename to src/Hydra/script/hydra_test.pl