diff --git a/backend/lib/Controller/GroupController.php b/backend/lib/Controller/AggregatorController.php
similarity index 100%
rename from backend/lib/Controller/GroupController.php
rename to backend/lib/Controller/AggregatorController.php
diff --git a/backend/lib/Util/Definition.php b/backend/lib/Model/Definition.php
similarity index 100%
rename from backend/lib/Util/Definition.php
rename to backend/lib/Model/Definition.php
diff --git a/backend/lib/Router.php b/backend/lib/Router.php
index 202c487..8a80c2c 100644
--- a/backend/lib/Router.php
+++ b/backend/lib/Router.php
@@ -84,7 +84,7 @@ class Router {
 			}
 		}
 		else {
-			throw new \Exception('no PATH_INFO found');
+			throw new \Exception('no CGI PATH_INFO envvar found');
 		}
 	}
 
@@ -100,6 +100,9 @@ class Router {
 		elseif (isset($_SERVER['ORIG_PATH_INFO'])) {
 			return $_SERVER['ORIG_PATH_INFO'];
 		}
+		elseif (strlen($_SERVER['PHP_SELF']) > strlen($_SERVER['SCRIPT_NAME'])) {
+			return substr($_SERVER['PHP_SELF'], strlen($_SERVER['SCRIPT_NAME']));
+		}
 		else {
 			return FALSE;
 		}
@@ -114,4 +117,4 @@ class Router {
 	public function getAction() { return $this->action; }
 }
 
-?>
\ No newline at end of file
+?>