diff --git a/lib/base.php b/lib/base.php
index eaee842465..a81f1a59b8 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -84,6 +84,11 @@ class OC {
 	 */
 	public static $loader = null;
 
+	/**
+	 * @var \OC\Server
+	 */
+	public static $server = null;
+
 	public static function initPaths() {
 		// calculate the root directories
 		OC::$SERVERROOT = str_replace("\\", '/', substr(__DIR__, 0, -4));
@@ -361,6 +366,9 @@ class OC {
 		self::$loader->registerPrefix('Patchwork', '3rdparty');
 		spl_autoload_register(array(self::$loader, 'load'));
 
+		// setup the basic server
+		self::$server = new \OC\Server();
+
 		// set some stuff
 		//ob_start();
 		error_reporting(E_ALL | E_STRICT);
diff --git a/lib/public/core/iservercontainer.php b/lib/public/core/iservercontainer.php
new file mode 100644
index 0000000000..df744ab6fd
--- /dev/null
+++ b/lib/public/core/iservercontainer.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace OCP\Core;
+
+
+/**
+ * Class IServerContainer
+ * @package OCP\Core
+ *
+ * This container holds all ownCloud services
+ */
+interface IServerContainer {
+
+}
diff --git a/lib/server.php b/lib/server.php
new file mode 100644
index 0000000000..f8f25c046d
--- /dev/null
+++ b/lib/server.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace OC;
+
+use OCP\Core\IServerContainer;
+
+/**
+ * Class Server
+ * @package OC
+ *
+ * TODO: hookup all manager classes
+ */
+class Server implements IServerContainer {
+
+}