Merge branch 'master' into sharing. Integrate with changes in master, rename classes

Conflicts:
	lib/base.php

193 files changed, 3574 insertions, 2727 deletions

diff --git a/.tx/config b/.tx/config
new file mode 100644
index 00000000000..55ae6df0f4e
--- /dev/null
+++ b/.tx/config
@@ -0,0 +1,28 @@
+[main]
+host = https://www.transifex.net
+
+[owncloud.admin]
+file_filter = l10n/<lang>/admin.po
+source_file = l10n/templates/admin.pot
+source_lang = en
+
+[owncloud.core]
+file_filter = l10n/<lang>/core.po
+source_file = l10n/templates/core.pot
+source_lang = en
+
+[owncloud.help]
+file_filter = l10n/<lang>/help.po
+source_file = l10n/templates/help.pot
+source_lang = en
+
+[owncloud.log]
+file_filter = l10n/<lang>/log.po
+source_file = l10n/templates/log.pot
+source_lang = en
+
+[owncloud.settings]
+file_filter = l10n/<lang>/settings.po
+source_file = l10n/templates/settings.pot
+source_lang = en
+
diff --git a/3dparty/MDB2/Driver/Manager/sqlite.php b/3dparty/MDB2/Driver/Manager/sqlite.php
index 5258cff891d..64019669645 100644
--- a/3dparty/MDB2/Driver/Manager/sqlite.php
+++ b/3dparty/MDB2/Driver/Manager/sqlite.php
@@ -72,7 +72,7 @@ class MDB2_Driver_Manager_sqlite extends MDB2_Driver_Manager_Common
     function createDatabase($name, $options = array())
     {
 		global $SERVERROOT;
-		$datadir=OC_CONFIG::getValue( "datadirectory", "$SERVERROOT/data" );
+		$datadir=OC_Config::getValue( "datadirectory", "$SERVERROOT/data" );
         $db =$this->getDBInstance();
         if (PEAR::isError($db)) {
             return $db;
diff --git a/3dparty/MDB2/Driver/sqlite.php b/3dparty/MDB2/Driver/sqlite.php
index 48f233167c7..63db241b863 100644
--- a/3dparty/MDB2/Driver/sqlite.php
+++ b/3dparty/MDB2/Driver/sqlite.php
@@ -348,7 +348,7 @@ class MDB2_Driver_sqlite extends MDB2_Driver_Common
     function connect()
     {
 		global $SERVERROOT;
-		$datadir=OC_CONFIG::getValue( "datadirectory", "$SERVERROOT/data" );
+		$datadir=OC_Config::getValue( "datadirectory", "$SERVERROOT/data" );
         $database_file = $this->_getDatabaseFile($this->database_name);
         if (is_resource($this->connection)) {
             //if (count(array_diff($this->connected_dsn, $this->dsn)) == 0
diff --git a/admin/ajax/changepassword.php b/admin/ajax/changepassword.php
index 51634908a76..98c2a8b37a1 100644
--- a/admin/ajax/changepassword.php
+++ b/admin/ajax/changepassword.php
@@ -7,7 +7,7 @@ require_once('../../lib/base.php');
 header( "Content-Type: application/jsonrequest" );
 
 // Check if we are a user
-if( !OC_USER::isLoggedIn() || !OC_GROUP::inGroup( OC_USER::getUser(), 'admin' )){
+if( !OC_User::isLoggedIn() || !OC_Group::inGroup( OC_User::getUser(), 'admin' )){
 	echo json_encode( array( "status" => "error", "data" => array( "message" => "Authentication error" )));
 	exit();
 }
@@ -16,7 +16,7 @@ $username = $_POST["username"];
 $password = $_POST["password"];
 
 // Return Success story
-if( OC_USER::setPassword( $username, $password )){
+if( OC_User::setPassword( $username, $password )){
 	echo json_encode( array( "status" => "success", "data" => array( "username" => $username )));
 }
 else{
diff --git a/admin/ajax/creategroup.php b/admin/ajax/creategroup.php
index df9a36aaa2f..2631937b14d 100644
--- a/admin/ajax/creategroup.php
+++ b/admin/ajax/creategroup.php
@@ -7,7 +7,7 @@ require_once('../../lib/base.php');
 header( "Content-Type: application/jsonrequest" );
 
 // Check if we are a user
-if( !OC_USER::isLoggedIn() || !OC_GROUP::inGroup( OC_USER::getUser(), 'admin' )){
+if( !OC_User::isLoggedIn() || !OC_Group::inGroup( OC_User::getUser(), 'admin' )){
 	echo json_encode( array( "status" => "error", "data" => array( "message" => "Authentication error" )));
 	exit();
 }
@@ -15,13 +15,13 @@ if( !OC_USER::isLoggedIn() || !OC_GROUP::inGroup( OC_USER::getUser(), 'admin' ))
 $groupname = $_POST["groupname"];
 
 // Does the group exist?
-if( in_array( $groupname, OC_GROUP::getGroups())){
+if( in_array( $groupname, OC_Group::getGroups())){
 	echo json_encode( array( "status" => "error", "data" => array( "message" => "Group already exists" )));
 	exit();
 }
 
 // Return Success story
-if( OC_GROUP::createGroup( $groupname )){
+if( OC_Group::createGroup( $groupname )){
 	echo json_encode( array( "status" => "success", "data" => array( "groupname" => $groupname )));
 }
 else{
diff --git a/admin/ajax/createuser.php b/admin/ajax/createuser.php
index 507ded9079f..1bb655ed336 100644
--- a/admin/ajax/createuser.php
+++ b/admin/ajax/createuser.php
@@ -7,7 +7,7 @@ require_once('../../lib/base.php');
 header( "Content-Type: application/jsonrequest" );
 
 // Check if we are a user
-if( !OC_USER::isLoggedIn() || !OC_GROUP::inGroup( OC_USER::getUser(), 'admin' )){
+if( !OC_User::isLoggedIn() || !OC_Group::inGroup( OC_User::getUser(), 'admin' )){
 	echo json_encode( array( "status" => "error", "data" => array( "message" => "Authentication error" )));
 	exit();
 }
@@ -20,17 +20,17 @@ $username = $_POST["username"];
 $password = $_POST["password"];
 
 // Does the group exist?
-if( in_array( $username, OC_USER::getUsers())){
+if( in_array( $username, OC_User::getUsers())){
 	echo json_encode( array( "status" => "error", "data" => array( "message" => "User already exists" )));
 	exit();
 }
 
 // Return Success story
-if( OC_USER::createUser( $username, $password )){
+if( OC_User::createUser( $username, $password )){
 	foreach( $groups as $i ){
-		OC_GROUP::addToGroup( $username, $i );
+		OC_Group::addToGroup( $username, $i );
 	}
-	echo json_encode( array( "status" => "success", "data" => array( "username" => $username, "groups" => implode( ", ", OC_GROUP::getUserGroups( $username )))));
+	echo json_encode( array( "status" => "success", "data" => array( "username" => $username, "groups" => implode( ", ", OC_Group::getUserGroups( $username )))));
 }
 else{
 	echo json_encode( array( "status" => "error", "data" => array( "message" => "Unable to add user" )));
diff --git a/admin/ajax/disableapp.php b/admin/ajax/disableapp.php
index d23f8de7ef0..dce62fa11d4 100644
--- a/admin/ajax/disableapp.php
+++ b/admin/ajax/disableapp.php
@@ -4,6 +4,6 @@
 require_once('../../lib/base.php');
 header( "Content-Type: application/jsonrequest" );
 
-OC_APP::disable($_POST['appid']);
+OC_App::disable($_POST['appid']);
 
 ?>
diff --git a/admin/ajax/enableapp.php b/admin/ajax/enableapp.php
index d988d7fd2df..eb1bfc54a04 100644
--- a/admin/ajax/enableapp.php
+++ b/admin/ajax/enableapp.php
@@ -4,6 +4,6 @@
 require_once('../../lib/base.php');
 header( "Content-Type: application/jsonrequest" );
 
-OC_APP::enable($_POST['appid']);
+OC_App::enable($_POST['appid']);
 
 ?>
diff --git a/admin/ajax/removegroup.php b/admin/ajax/removegroup.php
index e3d62e5fac8..bf80da741c7 100644
--- a/admin/ajax/removegroup.php
+++ b/admin/ajax/removegroup.php
@@ -7,7 +7,7 @@ require_once('../../lib/base.php');
 header( "Content-Type: application/jsonrequest" );
 
 // Check if we are a user
-if( !OC_USER::isLoggedIn() || !OC_GROUP::inGroup( OC_USER::getUser(), 'admin' )){
+if( !OC_User::isLoggedIn() || !OC_Group::inGroup( OC_User::getUser(), 'admin' )){
 	echo json_encode( array( "status" => "error", "data" => array( "message" => "Authentication error" )));
 	exit();
 }
@@ -15,7 +15,7 @@ if( !OC_USER::isLoggedIn() || !OC_GROUP::inGroup( OC_USER::getUser(), 'admin' ))
 $name = $_POST["groupname"];
 
 // Return Success story
-if( OC_GROUP::deleteGroup( $name )){
+if( OC_Group::deleteGroup( $name )){
 	echo json_encode( array( "status" => "success", "data" => array( "groupname" => $name )));
 }
 else{
diff --git a/admin/ajax/removeuser.php b/admin/ajax/removeuser.php
index 6b48146ad45..0a94884cb96 100644
--- a/admin/ajax/removeuser.php
+++ b/admin/ajax/removeuser.php
@@ -7,7 +7,7 @@ require_once('../../lib/base.php');
 header( "Content-Type: application/jsonrequest" );
 
 // Check if we are a user
-if( !OC_USER::isLoggedIn() || !OC_GROUP::inGroup( OC_USER::getUser(), 'admin' )){
+if( !OC_User::isLoggedIn() || !OC_Group::inGroup( OC_User::getUser(), 'admin' )){
 	echo json_encode( array( "status" => "error", "data" => array( "message" => "Authentication error" )));
 	exit();
 }
@@ -15,7 +15,7 @@ if( !OC_USER::isLoggedIn() || !OC_GROUP::inGroup( OC_USER::getUser(), 'admin' ))
 $username = $_POST["username"];
 
 // Return Success story
-if( OC_USER::deleteUser( $username )){
+if( OC_User::deleteUser( $username )){
 	echo json_encode( array( "status" => "success", "data" => array( "username" => $username )));
 }
 else{
diff --git a/admin/ajax/togglegroups.php b/admin/ajax/togglegroups.php
index 5c7bd393e92..808e57dc9d6 100644
--- a/admin/ajax/togglegroups.php
+++ b/admin/ajax/togglegroups.php
@@ -7,7 +7,7 @@ require_once('../../lib/base.php');
 header( "Content-Type: application/jsonrequest" );
 
 // Check if we are a user
-if( !OC_USER::isLoggedIn() || !OC_GROUP::inGroup( OC_USER::getUser(), 'admin' )){
+if( !OC_User::isLoggedIn() || !OC_Group::inGroup( OC_User::getUser(), 'admin' )){
 	echo json_encode( array( "status" => "error", "data" => array( "message" => "Authentication error" )));
 	exit();
 }
@@ -20,13 +20,13 @@ $username = $_POST["username"];
 $group = $_POST["group"];
 
 // Toggle group
-if( OC_GROUP::inGroup( $username, $group )){
+if( OC_Group::inGroup( $username, $group )){
 	$action = "remove";
 	$error = "remove user from";
-	$success = OC_GROUP::removeFromGroup( $username, $group );
+	$success = OC_Group::removeFromGroup( $username, $group );
 }
 else{
-	$success = OC_GROUP::addToGroup( $username, $group );
+	$success = OC_Group::addToGroup( $username, $group );
 }
 
 // Return Success story
diff --git a/admin/appinfo/app.php b/admin/appinfo/app.php
index 7ce784cfb98..dfb9aee8159 100644
--- a/admin/appinfo/app.php
+++ b/admin/appinfo/app.php
@@ -1,12 +1,12 @@
 <?php
 
-OC_APP::register( array( "order" => 1, "id" => "admin", "name" => "Administration" ));
+OC_App::register( array( "order" => 1, "id" => "admin", "name" => "Administration" ));
 
-// OC_APP::addAdminPage( array( "id" => "core_system", "order" => 1, "href" => OC_HELPER::linkTo( "admin", "system.php" ), "name" =>"System", "icon" => OC_HELPER::imagePath( "admin", "administration.png" )));
-OC_APP::addAdminPage( array( "id" => "core_users", "order" => 2, "href" => OC_HELPER::linkTo( "admin", "users.php" ), "name" => "Users", "icon" => OC_HELPER::imagePath( "admin", "users.png" )));
-OC_APP::addAdminPage( array( "id" => "core_apps", "order" => 3, "href" => OC_HELPER::linkTo( "admin", "apps.php?installed" ), "name" => "Apps", "icon" => OC_HELPER::imagePath( "admin", "apps.png" )));
+// OC_App::addAdminPage( array( "id" => "core_system", "order" => 1, "href" => OC_Helper::linkTo( "admin", "system.php" ), "name" =>"System", "icon" => OC_Helper::imagePath( "admin", "administration.png" )));
+OC_App::addAdminPage( array( "id" => "core_users", "order" => 2, "href" => OC_Helper::linkTo( "admin", "users.php" ), "name" => "Users", "icon" => OC_Helper::imagePath( "admin", "users.png" )));
+OC_App::addAdminPage( array( "id" => "core_apps", "order" => 3, "href" => OC_Helper::linkTo( "admin", "apps.php?installed" ), "name" => "Apps", "icon" => OC_Helper::imagePath( "admin", "apps.png" )));
 
 // Add subentries for App installer
-OC_APP::addNavigationSubEntry( "core_apps", array( "id" => "core_apps_get", "order" => 4, "href" => OC_HELPER::linkTo( "admin", "apps.php" ), "name" => "Get new apps", "icon" => OC_HELPER::imagePath( "admin", "navicon.png" )));
+OC_App::addNavigationSubEntry( "core_apps", array( "id" => "core_apps_get", "order" => 4, "href" => OC_Helper::linkTo( "admin", "apps.php" ), "name" => "Get new apps", "icon" => OC_Helper::imagePath( "admin", "navicon.png" )));
 
 ?>
diff --git a/admin/apps.php b/admin/apps.php
index bc598a6991e..4f39feab0c5 100644
--- a/admin/apps.php
+++ b/admin/apps.php
@@ -22,16 +22,14 @@
 */
 
 require_once('../lib/base.php');
-include_once('../lib/installer.php');
-require( 'template.php' );
-if( !OC_USER::isLoggedIn() || !OC_GROUP::inGroup( OC_USER::getUser(), 'admin' )){
-	header( "Location: ".OC_HELPER::linkTo( "", "index.php" ));
+if( !OC_User::isLoggedIn() || !OC_Group::inGroup( OC_User::getUser(), 'admin' )){
+	header( "Location: ".OC_Helper::linkTo( "", "index.php" ));
 	exit();
 }
 
 // Load the files we need
-OC_UTIL::addStyle( "admin", "apps" );
-OC_UTIL::addScript( "admin", "apps" );
+OC_Util::addStyle( "admin", "apps" );
+OC_Util::addScript( "admin", "apps" );
 
 
 if(isset($_GET['id']))  $id=$_GET['id']; else $id=0;
@@ -40,32 +38,32 @@ if(isset($_GET['installed'])) $installed=true; else $installed=false;
 
 if($installed){
 	global $SERVERROOT;
-	OC_INSTALLER::installShippedApps(false);
-	$apps = OC_APPCONFIG::getApps();
+	OC_Installer::installShippedApps(false);
+	$apps = OC_Appconfig::getApps();
 	$records = array();
 
-	OC_APP::setActiveNavigationEntry( "core_apps" );
+	OC_App::setActiveNavigationEntry( "core_apps" );
 	foreach($apps as $app){
-		$info=OC_APP::getAppInfo("$SERVERROOT/apps/$app/appinfo/info.xml");
+		$info=OC_App::getAppInfo("$SERVERROOT/apps/$app/appinfo/info.xml");
 		$record = array( 'id' => $app,
 				 'name' => $info['name'],
 				 'version' => $info['version'],
 				 'author' => $info['author'],
-				 'enabled' => OC_APP::isEnabled( $app ));
+				 'enabled' => OC_App::isEnabled( $app ));
 		$records[]=$record;
 	}
 
-	$tmpl = new OC_TEMPLATE( "admin", "appsinst", "admin" );
+	$tmpl = new OC_Template( "admin", "appsinst", "admin" );
 	$tmpl->assign( "apps", $records );
 	$tmpl->printPage();
 	unset($tmpl);
 	exit();
 }else{
-	$categories=OC_OCSCLIENT::getCategories();
+	$categories=OC_OCSClient::getCategories();
 	if($categories==NULL){
-		OC_APP::setActiveNavigationEntry( "core_apps" );
+		OC_App::setActiveNavigationEntry( "core_apps" );
 
-		$tmpl = new OC_TEMPLATE( "admin", "app_noconn", "admin" );
+		$tmpl = new OC_Template( "admin", "app_noconn", "admin" );
 		$tmpl->printPage();
 		unset($tmpl);
 		exit();
@@ -73,18 +71,18 @@ if($installed){
 
 
 	if($id==0) {
-		OC_APP::setActiveNavigationEntry( "core_apps_get" );
+		OC_App::setActiveNavigationEntry( "core_apps_get" );
 
 		if($cat==0){
 			$numcats=array();
 			foreach($categories as $key=>$value) $numcats[]=$key;
-			$apps=OC_OCSCLIENT::getApplications($numcats);
+			$apps=OC_OCSClient::getApplications($numcats);
 		}else{
-			$apps=OC_OCSCLIENT::getApplications($cat);
+			$apps=OC_OCSClient::getApplications($cat);
 		}
 
 		// return template
-		$tmpl = new OC_TEMPLATE( "admin", "apps", "admin" );
+		$tmpl = new OC_Template( "admin", "apps", "admin" );
 
 		$tmpl->assign( "categories", $categories );
 		$tmpl->assign( "apps", $apps );
@@ -92,11 +90,11 @@ if($installed){
 		unset($tmpl);
 
 	}else{
-		OC_APP::setActiveNavigationEntry( "core_apps" );
+		OC_App::setActiveNavigationEntry( "core_apps" );
 
-		$app=OC_OCSCLIENT::getApplication($id);
+		$app=OC_OCSClient::getApplication($id);
 
-		$tmpl = new OC_TEMPLATE( "admin", "app", "admin" );
+		$tmpl = new OC_Template( "admin", "app", "admin" );
 		$tmpl->assign( "categories", $categories );
 		$tmpl->assign( "app", $app );
 		$tmpl->printPage();
diff --git a/admin/l10n/da.php b/admin/l10n/da.php
index 477dd9db9e2..467c259dc37 100644
--- a/admin/l10n/da.php
+++ b/admin/l10n/da.php
@@ -7,11 +7,10 @@
 "Modified" => "Ændret",
 "Administration" => "Administration",
 "System Settings" => "System indstillinger",
-"Add user" => "Tilføj bruger",
+"Users" => "Brugere",
+"Groups" => "Grupper",
 "Password" => "Kodeord",
-"Create user" => "Lav bruger",
 "remove" => "slet",
-"Groups" => "Grupper",
 "Create group" => "Lav gruppe",
 "Force new password:" => "Tving ny adgangskode",
 "Set" => "Indstil",
diff --git a/admin/l10n/de.php b/admin/l10n/de.php
index 9d1b12b1a16..a1a0ec099e7 100644
--- a/admin/l10n/de.php
+++ b/admin/l10n/de.php
@@ -7,10 +7,10 @@
 "Modified" => "Änderungsdatum",
 "Administration" => "Verwaltung",
 "System Settings" => "Systemeinstellungen",
+"Users" => "Nutzer",
 "Groups" => "Gruppen",
-"Add user" => "Nutzer hinzufügen",
 "Password" => "Passwort",
-"Create user" => "Nutzer erstellen",
+"Create" => "Erstellen",
 "remove" => "entfernen",
 "Create group" => "Gruppe erstellen",
 "Force new password:" => "Neues Passwort:",
diff --git a/admin/l10n/fr.php b/admin/l10n/fr.php
new file mode 100644
index 00000000000..e8d41a4be72
--- /dev/null
+++ b/admin/l10n/fr.php
@@ -0,0 +1,20 @@
+<?php $TRANSLATIONS = array(
+"read more" => "en lire plus",
+"INSTALL" => "INSTALLATION",
+"Apps Repository" => "Répertoire d'applications",
+"Cannot connect to apps repository" => "Impossible de se connecter au répertoire d'applications",
+"Name" => "Nom",
+"Modified" => "Modifié le",
+"Administration" => "Administration",
+"System Settings" => "Préférences Système",
+"Users" => "Utilisateurs",
+"Groups" => "Groupes",
+"Password" => "Mot de passe",
+"Create" => "Créer",
+"remove" => "retirer",
+"Create group" => "Créer un groupe",
+"Force new password:" => "Forcer un nouveau mot de passe :",
+"Set" => "Appliquer",
+"Do you really want to delete user" => "Voulez-vous réellement supprimer cet utilisateur",
+"Do you really want to delete group" => "Voulez-vous réellement supprimer ce groupe"
+);
diff --git a/admin/l10n/nl.php b/admin/l10n/nl.php
index cfbc1b0f515..138c95d2c98 100644
--- a/admin/l10n/nl.php
+++ b/admin/l10n/nl.php
@@ -7,10 +7,9 @@
 "Modified" => "Laatst aangepast",
 "Administration" => "Administratie",
 "System Settings" => "Systeeminstellingen",
+"Users" => "Gebruikers",
 "Groups" => "Groepen",
-"Add user" => "Gebruiker toevoegen",
 "Password" => "Wachtwoord",
-"Create user" => "Gebruiker aanmaken",
 "remove" => "verwijder",
 "Create group" => "Groep aanmaken",
 "Force new password:" => "Forceer nieuw wachtwoord:",
diff --git a/admin/l10n/pl.php b/admin/l10n/pl.php
index 9995c5da56f..169bb37b109 100644
--- a/admin/l10n/pl.php
+++ b/admin/l10n/pl.php
@@ -7,15 +7,13 @@
 "Modified" => "Zmodyfikowano",
 "Administration" => "Administracja",
 "System Settings" => "Ustawienia systemowe",
-"Add user" => "Dodaj użytkownika",
+"Users" => "Użytkownicy",
+"Groups" => "Grupy",
 "Password" => "Hasło",
-"Create user" => "Utwórz użytkownika",
 "remove" => "usuń",
-"Groups" => "Grupy",
 "Create group" => "Utwórz grupę",
 "Force new password:" => "Wymuś nowe hasło",
 "Set" => "Ustaw",
 "Do you really want to delete user" => "Czy naprawdę chcesz usunąć użytkownika",
-"Do you really want to delete group" => "Czy naprawdę chcesz usunąć grupę",
-"Users" => "Użytkownicy"
+"Do you really want to delete group" => "Czy naprawdę chcesz usunąć grupę"
 );
diff --git a/admin/system.php b/admin/system.php
index 284509144ee..11a76132b4c 100644
--- a/admin/system.php
+++ b/admin/system.php
@@ -22,15 +22,14 @@
 */
 
 require_once('../lib/base.php');
-require( 'template.php' );
-if( !OC_USER::isLoggedIn() || !OC_GROUP::inGroup( OC_USER::getUser(), 'admin' )){
-	header( "Location: ".OC_HELPER::linkTo( "index.php" ));
+if( !OC_User::isLoggedIn() || !OC_Group::inGroup( OC_User::getUser(), 'admin' )){
+	header( "Location: ".OC_Helper::linkTo( "index.php" ));
 	exit();
 }
 
-OC_APP::setActiveNavigationEntry( "administration" );
+OC_App::setActiveNavigationEntry( "administration" );
 
-$tmpl = new OC_TEMPLATE( "admin", "system", "admin" );
+$tmpl = new OC_Template( "admin", "system", "admin" );
 $tmpl->printPage();
 
 ?>
diff --git a/admin/templates/apps.php b/admin/templates/apps.php
index 593aad63182..50dd497c333 100644
--- a/admin/templates/apps.php
+++ b/admin/templates/apps.php
@@ -17,8 +17,8 @@
 	<tbody>
 		<?php foreach($_["apps"] as $app): ?>
 			<tr>
-				<td width="1"><?php if($app["preview"] <> "") { echo('<a href="'.OC_HELPER::linkTo( "admin", "apps.php" ).'?id='.$app['id'].'"><img class="preview" border="0" src="'.$app["preview"].'" /></a>'); } ?> </a></td>
-				<td class="name"><a href="<?php echo(OC_HELPER::linkTo( "admin", "apps.php" ).'?id='.$app['id']); ?>" title=""><?php echo $app["name"]; ?></a><br /><?php  echo('<span class="type">'.$app['typename'].'</span>'); ?></td>
+				<td width="1"><?php if($app["preview"] <> "") { echo('<a href="'.OC_Helper::linkTo( "admin", "apps.php" ).'?id='.$app['id'].'"><img class="preview" border="0" src="'.$app["preview"].'" /></a>'); } ?> </a></td>
+				<td class="name"><a href="<?php echo(OC_Helper::linkTo( "admin", "apps.php" ).'?id='.$app['id']); ?>" title=""><?php echo $app["name"]; ?></a><br /><?php  echo('<span class="type">'.$app['typename'].'</span>'); ?></td>
 				<td class="date"><?php echo $l->l('datetime', $app["changed"]); ?></td>
 			</tr>
 		<?php endforeach; ?>
diff --git a/admin/templates/users.php b/admin/templates/users.php
index 147db7c7aa4..6fc3e643010 100644
--- a/admin/templates/users.php
+++ b/admin/templates/users.php
@@ -33,7 +33,7 @@
 					<td x-use="username"><span x-use="usernamediv"><?php echo $user["name"]; ?></span></td>
 					<td x-use="usergroups"><div x-use="usergroupsdiv"><?php if( $user["groups"] ){ echo $user["groups"]; }else{echo "&nbsp";} ?></div></td>
 					<td>
-						<?php if($user['name']!=OC_USER::getUser()):?>
+						<?php if($user['name']!=OC_User::getUser()):?>
 							<a  class="removeuserbutton" href=""><?php echo $l->t( 'remove' ); ?></a>
 						<?php endif;?>
 					</td>
diff --git a/admin/users.php b/admin/users.php
index 8237d06da0b..fd0b6fec01b 100644
--- a/admin/users.php
+++ b/admin/users.php
@@ -22,35 +22,34 @@
 */
 
 require_once('../lib/base.php');
-require( 'template.php' );
-if( !OC_USER::isLoggedIn() || !OC_GROUP::inGroup( OC_USER::getUser(), 'admin' )){
-	header( "Location: ".OC_HELPER::linkTo( "index.php" ));
+if( !OC_User::isLoggedIn() || !OC_Group::inGroup( OC_User::getUser(), 'admin' )){
+	header( "Location: ".OC_Helper::linkTo( "index.php" ));
 	exit();
 }
 
 // We have some javascript foo!
-OC_UTIL::addScript( "admin", "users" );
-OC_UTIL::addStyle( "admin", "users" );
-OC_APP::setActiveNavigationEntry( "core_users" );
+OC_Util::addScript( "admin", "users" );
+OC_Util::addStyle( "admin", "users" );
+OC_App::setActiveNavigationEntry( "core_users" );
 
 $users = array();
 $groups = array();
 
-foreach( OC_USER::getUsers() as $i ){
+foreach( OC_User::getUsers() as $i ){
 	// Do some more work here soon
 	$ingroups = array();
-	foreach( OC_GROUP::getUserGroups( $i ) as $userGroup ){
+	foreach( OC_Group::getUserGroups( $i ) as $userGroup ){
 		$ingroups[] = $userGroup;
 	}
 	$users[] = array( "name" => $i, "groups" => join( ", ", $ingroups ));
 }
 
-foreach( OC_GROUP::getGroups() as $i ){
+foreach( OC_Group::getGroups() as $i ){
 	// Do some more work here soon
 	$groups[] = array( "name" => $i );
 }
 
-$tmpl = new OC_TEMPLATE( "admin", "users", "admin" );
+$tmpl = new OC_Template( "admin", "users", "admin" );
 $tmpl->assign( "users", $users );
 $tmpl->assign( "groups", $groups );
 $tmpl->printPage();
diff --git a/apps/files_imageviewer/appinfo/app.php b/apps/files_imageviewer/appinfo/app.php
index 50a7253e01b..6d32e2d628e 100644
--- a/apps/files_imageviewer/appinfo/app.php
+++ b/apps/files_imageviewer/appinfo/app.php
@@ -1,8 +1,8 @@
 <?php
 
-if(OC_APP::getCurrentApp()=='files'){
-	OC_UTIL::addScript( 'files_imageviewer', 'lightbox' );
-	OC_UTIL::addStyle( 'files_imageviewer', 'lightbox' );
+if(OC_App::getCurrentApp()=='files'){
+	OC_Util::addScript( 'files_imageviewer', 'lightbox' );
+	OC_Util::addStyle( 'files_imageviewer', 'lightbox' );
 }
 
 ?>
diff --git a/apps/files_publiclink/admin.php b/apps/files_publiclink/admin.php
index afb726da312..8187039c3a6 100644
--- a/apps/files_publiclink/admin.php
+++ b/apps/files_publiclink/admin.php
@@ -25,29 +25,28 @@
 // Init owncloud
 require_once('../../lib/base.php');
 require_once( 'lib_public.php' );
-require( 'template.php' );
 
 
 // Check if we are a user
-if( !OC_USER::isLoggedIn()){
-	header( "Location: ".OC_HELPER::linkTo( "index.php" ));
+if( !OC_User::isLoggedIn()){
+	header( "Location: ".OC_Helper::linkTo( "index.php" ));
 	exit();
 }
 
-OC_APP::setActiveNavigationEntry( "files_publiclink_administration" );
+OC_App::setActiveNavigationEntry( "files_publiclink_administration" );
 
-OC_UTIL::addStyle( 'files_publiclink', 'admin' );
-OC_UTIL::addScript( 'files_publiclink', 'admin' );
+OC_Util::addStyle( 'files_publiclink', 'admin' );
+OC_Util::addScript( 'files_publiclink', 'admin' );
 
 if(isset($_SERVER['HTTPS'])) {
-	$baseUrl= "https://". $_SERVER['SERVER_NAME'] . OC_HELPER::linkTo('files_publiclink','get.php');
+	$baseUrl= "https://". $_SERVER['SERVER_NAME'] . OC_Helper::linkTo('files_publiclink','get.php');
 }else{
-	$baseUrl= "http://". $_SERVER['SERVER_NAME'] . OC_HELPER::linkTo('files_publiclink','get.php');
+	$baseUrl= "http://". $_SERVER['SERVER_NAME'] . OC_Helper::linkTo('files_publiclink','get.php');
 }
 
 
 // return template
-$tmpl = new OC_TEMPLATE( "files_publiclink", "admin", "admin" );
+$tmpl = new OC_Template( "files_publiclink", "admin", "admin" );
 $tmpl->assign( 'links', OC_PublicLink::getLinks());
 $tmpl->assign('baseUrl',$baseUrl);
 $tmpl->printPage();
diff --git a/apps/files_publiclink/appinfo/app.php b/apps/files_publiclink/appinfo/app.php
index 894327e83d3..314a3bf896a 100644
--- a/apps/files_publiclink/appinfo/app.php
+++ b/apps/files_publiclink/appinfo/app.php
@@ -1,6 +1,6 @@
 <?php
 
-OC_APP::addSettingsPage( array( "id" => "files_publiclink_administration", "order" => 1, "href" => OC_HELPER::linkTo( "files_publiclink", "admin.php" ), "name" => "Public Links", "icon" => OC_HELPER::imagePath( "files_publiclink", "share.png" )));
+OC_App::addSettingsPage( array( "id" => "files_publiclink_administration", "order" => 1, "href" => OC_Helper::linkTo( "files_publiclink", "admin.php" ), "name" => "Public Links", "icon" => OC_Helper::imagePath( "files_publiclink", "share.png" )));
 
 
 ?>
diff --git a/apps/files_publiclink/get.php b/apps/files_publiclink/get.php
index d3e3022e761..6bcefc2e4e8 100644
--- a/apps/files_publiclink/get.php
+++ b/apps/files_publiclink/get.php
@@ -3,7 +3,6 @@ $RUNTIME_NOAPPS=true; //no need to load the apps
 $RUNTIME_NOSETUPFS=true; //don't setup the fs yet
 
 require_once '../../lib/base.php';
-require( 'template.php' );
 
 require_once 'lib_public.php';
 
@@ -19,18 +18,18 @@ if($path!==false){
 		$subPath='';
 	}
 	$path.=$subPath;
-	if(!OC_FILESYSTEM::file_exists($path)){
+	if(!OC_Filesystem::file_exists($path)){
 		header("HTTP/1.0 404 Not Found");
-		$tmpl = new OC_TEMPLATE( '', '404', 'guest' );
+		$tmpl = new OC_Template( '', '404', 'guest' );
 		$tmpl->assign('file',$subPath);
 		$tmpl->printPage();
 		exit;
 	}
-	if(OC_FILESYSTEM::is_dir($path)){
+	if(OC_Filesystem::is_dir($path)){
 		$files = array();
 		$rootLength=strlen($root);
-		foreach( OC_FILES::getdirectorycontent( $path ) as $i ){
-			$i['date'] = OC_UTIL::formatDate($i['mtime'] );
+		foreach( OC_Files::getdirectorycontent( $path ) as $i ){
+			$i['date'] = OC_Util::formatDate($i['mtime'] );
 			$i['directory']=substr($i['directory'],$rootLength);
 			if($i['directory']=='/'){
 				$i['directory']='';
@@ -48,36 +47,36 @@ if($path!==false){
 			}
 		}
 		
-		$breadcrumbNav = new OC_TEMPLATE( "files_publiclink", "breadcrumb", "" );
+		$breadcrumbNav = new OC_Template( "files_publiclink", "breadcrumb", "" );
 		$breadcrumbNav->assign( "breadcrumb", $breadcrumb );
 		$breadcrumbNav->assign('token',$token);
 		
-		$list = new OC_TEMPLATE( 'files_publiclink', 'files', '' );
+		$list = new OC_Template( 'files_publiclink', 'files', '' );
 		$list->assign( 'files', $files );
 		$list->assign('token',$token);
 		
-		$tmpl = new OC_TEMPLATE( 'files_publiclink', 'index', 'user' );
+		$tmpl = new OC_Template( 'files_publiclink', 'index', 'user' );
 		$tmpl->assign('fileList', $list->fetchPage());
 		$tmpl->assign( "breadcrumb", $breadcrumbNav->fetchPage() );
 		$tmpl->printPage();
 	}else{
 		//get time mimetype and set the headers
-		$mimetype=OC_FILESYSTEM::getMimeType($path);
+		$mimetype=OC_Filesystem::getMimeType($path);
 		header('Content-Transfer-Encoding: binary');
 		header('Content-Disposition: attachment; filename="'.basename($path).'"');
 		header('Expires: 0');
 		header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
 		header('Pragma: public');
 		header('Content-Type: ' . $mimetype);
-		header('Content-Length: ' . OC_FILESYSTEM::filesize($path));
+		header('Content-Length: ' . OC_Filesystem::filesize($path));
 		
 		//download the file
 		@ob_clean();
-		OC_FILESYSTEM::readfile($path);
+		OC_Filesystem::readfile($path);
 	}
 }else{
 	header("HTTP/1.0 404 Not Found");
-	$tmpl = new OC_TEMPLATE( '', '404', 'guest' );
+	$tmpl = new OC_Template( '', '404', 'guest' );
 	$tmpl->printPage();
 	die();
 }
diff --git a/apps/files_publiclink/lib_public.php b/apps/files_publiclink/lib_public.php
index b4bc86505ae..ff1df130834 100644
--- a/apps/files_publiclink/lib_public.php
+++ b/apps/files_publiclink/lib_public.php
@@ -6,8 +6,8 @@ class OC_PublicLink{
 	 * @param int (optional) expiretime time the link expires, as timestamp
 	 */
 	public function __construct($path,$expiretime=0){
-		if($path and  OC_FILESYSTEM::file_exists($path) and OC_FILESYSTEM::is_readable($path)){
-			$user=OC_USER::getUser();
+		if($path and  OC_Filesystem::file_exists($path) and OC_Filesystem::is_readable($path)){
+			$user=OC_User::getUser();
 			$token=sha1("$user-$path-$expiretime");
 			$query=OC_DB::prepare("INSERT INTO *PREFIX*publiclink VALUES(?,?,?,?)");
 			$result=$query->execute(array($token,$path,$user,$expiretime));
@@ -38,7 +38,7 @@ class OC_PublicLink{
 			$user=$data[0]['user'];
 			
 			//prepare the filesystem
-			OC_UTIL::setupFS($user);
+			OC_Util::setupFS($user);
 			
 			return $path;
 		}else{
@@ -60,7 +60,7 @@ class OC_PublicLink{
 	 */
 	static public function getLinks(){
 		$query=OC_DB::prepare("SELECT * FROM *PREFIX*publiclink WHERE user=?");
-		return $query->execute(array(OC_USER::getUser()))->fetchAll();
+		return $query->execute(array(OC_User::getUser()))->fetchAll();
 	}
 
 	/**
@@ -69,7 +69,7 @@ class OC_PublicLink{
 	static public function delete($token){
 		$query=OC_DB::prepare("SELECT user,path FROM *PREFIX*publiclink WHERE token=?");
 		$result=$query->execute(array($token))->fetchAll();
-		if(count($result)>0 and $result[0]['user']==OC_USER::getUser()){
+		if(count($result)>0 and $result[0]['user']==OC_User::getUser()){
 			$query=OC_DB::prepare("DELETE FROM *PREFIX*publiclink WHERE token=?");
 			$query->execute(array($token));
 		}
diff --git a/apps/files_sharing/ajax/share.php b/apps/files_sharing/ajax/share.php
index b2c3a477958..6e860d584ea 100644
--- a/apps/files_sharing/ajax/share.php
+++ b/apps/files_sharing/ajax/share.php
@@ -9,7 +9,7 @@ $uid_shared_with = $_GET['uid_shared_with'];
 $permissions = $_GET['permissions'];
 foreach ($sources as $source) {
 	foreach ($uid_shared_with as $uid) {
-		new OC_SHARE($source, $uid, $permissions);
+		new OC_Share($source, $uid, $permissions);
 	}
 }
 
diff --git a/apps/files_sharing/ajax/unshare.php b/apps/files_sharing/ajax/unshare.php
index 4d83d332257..78d7d2e25f0 100644
--- a/apps/files_sharing/ajax/unshare.php
+++ b/apps/files_sharing/ajax/unshare.php
@@ -6,6 +6,6 @@ require_once('../lib_share.php');
 
 $source = $_GET['source'];
 $uid_shared_with = $_GET['uid_shared_with'];
-OC_SHARE::unshare($source, $uid_shared_with);
+OC_Share::unshare($source, $uid_shared_with);
 
 ?>
\ No newline at end of file
diff --git a/apps/files_sharing/ajax/userautocomplete.php b/apps/files_sharing/ajax/userautocomplete.php
index 6e1469ae348..816e01ba9ee 100644
--- a/apps/files_sharing/ajax/userautocomplete.php
+++ b/apps/files_sharing/ajax/userautocomplete.php
@@ -3,7 +3,7 @@ $RUNTIME_NOAPPS = true;
 
 require_once('../../../lib/base.php');
 
-if (!OC_USER::isLoggedIn()) {
+if (!OC_User::isLoggedIn()) {
 	echo json_encode(array("status" => "error", "data" => array("message" => "Authentication error")));
 	exit();
 }
@@ -11,8 +11,8 @@ $query = $_GET['term'];
 $length = strlen($query);
 $query = strtolower($query);
 $users = array();
-$ocusers = OC_USER::getUsers();
-$self = OC_USER::getUser();
+$ocusers = OC_User::getUsers();
+$self = OC_User::getUser();
 $groups = OC_GROUP::getUserGroups($self);
 foreach ($ocusers as $user) {
 	if ($user != $self && substr(strtolower($user), 0, $length) == $query) {
diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php
index 60abcda50f9..e7e19869d2a 100644
--- a/apps/files_sharing/appinfo/app.php
+++ b/apps/files_sharing/appinfo/app.php
@@ -2,11 +2,11 @@
 
 require_once('apps/files_sharing/lib_share.php');
 
-OC_UTIL::addScript("files_sharing", "share");
-OC_APP::addNavigationSubEntry("files_index", array(
+OC_Util::addScript("files_sharing", "share");
+OC_App::addNavigationSubEntry("files_index", array(
   "id" => "files_sharing_list",
   "order" => 10, 
-  "href" => OC_HELPER::linkTo( "files_sharing", "list.php" ),
+  "href" => OC_Helper::linkTo( "files_sharing", "list.php" ),
   "name" => "Shared"));
 
 ?>
diff --git a/apps/files_sharing/lib_share.php b/apps/files_sharing/lib_share.php
index fa74cd14ee9..f8b00aa905d 100644
--- a/apps/files_sharing/lib_share.php
+++ b/apps/files_sharing/lib_share.php
@@ -20,13 +20,13 @@
  *
  */
 
-OC_HOOK::connect("OC_FILESYSTEM","post_delete", "OC_SHARE", "deleteItem");
-OC_HOOK::connect("OC_FILESYSTEM","post_rename", "OC_SHARE", "renameItem");
+OC_Hook::connect("OC_FILESYSTEM","post_delete", "OC_Share", "deleteItem");
+OC_Hook::connect("OC_FILESYSTEM","post_rename", "OC_Share", "renameItem");
 
 /**
  * This class manages shared items within the database. 
  */
-class OC_SHARE {
+class OC_Share {
 
 	const WRITE = 1;
 	const DELETE = 2;
@@ -39,8 +39,8 @@ class OC_SHARE {
 	 */
 	public function __construct($source, $uid_shared_with, $permissions, $public = false) {
 		if ($source && OC_FILESYSTEM::file_exists($source) && OC_FILESYSTEM::is_readable($source)) {
-			$source = "/".OC_USER::getUser()."/files".$source;
-			$uid_owner = OC_USER::getUser();
+			$source = "/".OC_User::getUser()."/files".$source;
+			$uid_owner = OC_User::getUser();
 			if ($public) {
 				// TODO create token for public file
 				$token = sha1("$uid_owner-$item");
@@ -85,8 +85,8 @@ class OC_SHARE {
 	* @return An array to be used by the IN operator in a query for uid_shared_with
 	*/
 	private static function getUserAndGroups() {
-		$self = OC_USER::getUser();
-		$groups = OC_GROUP::getUserGroups($self);
+		$self = OC_User::getUser();
+		$groups = OC_Group::getUserGroups($self);
 		array_unshift($groups, $self);
 		return $groups;
 	}
@@ -104,7 +104,7 @@ class OC_SHARE {
 		$source = $folders['source'].substr($oldTarget, strlen($folders['target']));
 		$item = self::getItem($folders['target']);
 		$query = OC_DB::prepare("INSERT INTO *PREFIX*sharing VALUES(?,?,?,?,?)");
-		$query->execute(array($item[0]['uid_owner'], OC_USER::getUser(), $source, $newTarget, $item[0]['permissions']));
+		$query->execute(array($item[0]['uid_owner'], OC_User::getUser(), $source, $newTarget, $item[0]['permissions']));
 	}
 
 	/**
@@ -115,7 +115,7 @@ class OC_SHARE {
 	public static function getItem($target) {
 		$target = self::cleanPath($target);
 		$query = OC_DB::prepare("SELECT uid_owner, source, permissions FROM *PREFIX*sharing WHERE target = ? AND uid_shared_with = ? LIMIT 1");
-		return $query->execute(array($target, OC_USER::getUser()))->fetchAll();
+		return $query->execute(array($target, OC_User::getUser()))->fetchAll();
 	}
 	
 	/**
@@ -124,7 +124,7 @@ class OC_SHARE {
 	 */
 	public static function getMySharedItems() {
 		$query = OC_DB::prepare("SELECT uid_shared_with, source, permissions FROM *PREFIX*sharing WHERE uid_owner = ?");
-		return $query->execute(array(OC_USER::getUser()))->fetchAll();
+		return $query->execute(array(OC_User::getUser()))->fetchAll();
 	}
 	
 	/**
@@ -230,7 +230,7 @@ class OC_SHARE {
 		$oldSource = self::cleanPath($oldSource);
 		$newSource = self::cleanPath($newSource);
 		$query = OC_DB::prepare("UPDATE *PREFIX*sharing SET source = REPLACE(source, ?, ?) WHERE uid_owner = ?");
-		$query->execute(array($oldSource, $newSource, OC_USER::getUser()));
+		$query->execute(array($oldSource, $newSource, OC_User::getUser()));
 	}
 	
 	/**
@@ -245,7 +245,7 @@ class OC_SHARE {
 		$oldTarget = self::cleanPath($oldTarget);
 		$newTarget = self::cleanPath($newTarget);
 		$query = OC_DB::prepare("UPDATE *PREFIX*sharing SET target = REPLACE(target, ?, ?) WHERE uid_shared_with = ?");
-		$query->execute(array($oldTarget, $newTarget, OC_USER::getUser()));
+		$query->execute(array($oldTarget, $newTarget, OC_User::getUser()));
 	}
 	
 	/**
@@ -260,7 +260,7 @@ class OC_SHARE {
 	public static function setPermissions($source, $uid_shared_with, $permissions) {
 		$source = self::cleanPath($source);
 		$query = OC_DB::prepare("UPDATE *PREFIX*sharing SET permissions = ? WHERE SUBSTR(source, 1, ?) = ? AND uid_shared_with = ? AND uid_owner = ?");
-		$query->execute(array($permissions, strlen($source), $source, $uid_shared_with, OC_USER::getUser()));
+		$query->execute(array($permissions, strlen($source), $source, $uid_shared_with, OC_User::getUser()));
 	}
 	
 	/**
@@ -274,7 +274,7 @@ class OC_SHARE {
 	public static function unshare($source, $uid_shared_with) {
 		$source = self::cleanPath($source);
 		$query = OC_DB::prepare("DELETE FROM *PREFIX*sharing WHERE SUBSTR(source, 1, ?) = ? AND uid_shared_with = ? AND uid_owner = ?");
-		$query->execute(array(strlen($source), $source, $uid_shared_with, OC_USER::getUser()));
+		$query->execute(array(strlen($source), $source, $uid_shared_with, OC_User::getUser()));
 	}
 	
 	/**
@@ -287,7 +287,7 @@ class OC_SHARE {
 	public static function unshareFromMySelf($target) {
 		$target = self::cleanPath($target);
 		$query = OC_DB::prepare("DELETE FROM *PREFIX*sharing WHERE SUBSTR(target, 1, ?) = ? AND uid_shared_with = ?");
-		$query->execute(array(strlen($target), $target, OC_USER::getUser()));
+		$query->execute(array(strlen($target), $target, OC_User::getUser()));
 	}
 
 	/**
@@ -295,10 +295,10 @@ class OC_SHARE {
 	* @param $arguments Array of arguments passed from OC_HOOK
 	*/
 	public static function deleteItem($arguments) {
-		$source = "/".OC_USER::getUser()."/files".$arguments['path'];
+		$source = "/".OC_User::getUser()."/files".$arguments['path'];
 		$source = self::cleanPath($source);
 		$query = OC_DB::prepare("DELETE FROM *PREFIX*sharing WHERE SUBSTR(source, 1, ?) = ? AND uid_owner = ?");
-		$query->execute(array(strlen($source), $source, OC_USER::getUser()));
+		$query->execute(array(strlen($source), $source, OC_User::getUser()));
 	}
 
 	/**
@@ -306,9 +306,9 @@ class OC_SHARE {
 	* @param $arguments Array of arguments passed from OC_HOOK
 	*/
 	public static function renameItem($arguments) {
-		$oldSource = "/".OC_USER::getUser()."/files".$arguments['oldpath'];
+		$oldSource = "/".OC_User::getUser()."/files".$arguments['oldpath'];
 		$oldSource = self::cleanPath($oldSource);
-		$newSource = "/".OC_USER::getUser()."/files".$arguments['newpath'];
+		$newSource = "/".OC_User::getUser()."/files".$arguments['newpath'];
 		$newSource = self::cleanPath($newSource);
 		self::setSource($oldSource, $newSource);
 	}
diff --git a/apps/files_sharing/list.php b/apps/files_sharing/list.php
index 6c27899369d..0a11f438eb7 100644
--- a/apps/files_sharing/list.php
+++ b/apps/files_sharing/list.php
@@ -22,19 +22,18 @@
 
 require_once('../../lib/base.php');
 require_once('lib_share.php');
-require('template.php');
 
-if (!OC_USER::isLoggedIn()){
+if (!OC_User::isLoggedIn()){
 	header( "Location: ".OC_HELPER::linkTo( "index.php" ));
 	exit();
 }
 
-OC_APP::setActiveNavigationEntry("files_sharing_list");
+OC_App::setActiveNavigationEntry("files_sharing_list");
 
-OC_UTIL::addScript("files_sharing", "list");
+OC_Util::addScript("files_sharing", "list");
 
-$tmpl = new OC_TEMPLATE("files_sharing", "list", "user");
-$tmpl->assign("shared_items", OC_SHARE::getMySharedItems());
+$tmpl = new OC_Template("files_sharing", "list", "user");
+$tmpl->assign("shared_items", OC_Share::getMySharedItems());
 $tmpl->printPage();
 
 ?>
\ No newline at end of file
diff --git a/apps/files_sharing/sharedstorage.php b/apps/files_sharing/sharedstorage.php
index 44a78277fc8..75767daf839 100644
--- a/apps/files_sharing/sharedstorage.php
+++ b/apps/files_sharing/sharedstorage.php
@@ -22,12 +22,10 @@
 
 require_once( 'lib_share.php' );
 
-OC_FILESYSTEM::registerStorageType('shared','OC_FILESTORAGE_SHARED',array('datadir'=>'string'));
-
 /**
  * Convert target path to source path and pass the function call to the correct storage provider
  */
-class OC_FILESTORAGE_SHARED extends OC_FILESTORAGE {
+class OC_Filestorage_Shared extends OC_Filestorage {
 	
 	private $datadir;
 	private $sourcePaths = array();
@@ -37,7 +35,7 @@ class OC_FILESTORAGE_SHARED extends OC_FILESTORAGE {
 	}
 	
 	public function getInternalPath($path) {
-		$mountPoint = OC_FILESYSTEM::getMountPoint($path);
+		$mountPoint = OC_Filesystem::getMountPoint($path);
 		$internalPath = substr($path, strlen($mountPoint));
 		return $internalPath;
 	}
@@ -47,7 +45,7 @@ class OC_FILESTORAGE_SHARED extends OC_FILESTORAGE {
 		if (array_key_exists($target, $this->sourcePaths)) {
 			return $this->sourcePaths[$target];
 		} else {
-			$source = OC_SHARE::getSource($target);
+			$source = OC_Share::getSource($target);
 			$this->sourcePaths[$target] = $source;
 			return $source;
 		}
@@ -60,7 +58,7 @@ class OC_FILESTORAGE_SHARED extends OC_FILESTORAGE {
 			$source = $this->getSource($path);
 			if ($source) {
 				if ($this->is_writeable($path)) {
-					$storage = OC_FILESYSTEM::getStorage($source);
+					$storage = OC_Filesystem::getStorage($source);
 					return $storage->mkdir($this->getInternalPath($source));
 				}
 			}
@@ -69,14 +67,14 @@ class OC_FILESTORAGE_SHARED extends OC_FILESTORAGE {
 	
 	public function rmdir($path) {
 		// The folder will be removed from the database, but won't be deleted from the owner's filesystem
-		OC_SHARE::unshareFromMySelf($this->datadir.$path);
+		OC_Share::unshareFromMySelf($this->datadir.$path);
 	}
 	
 	public function opendir($path) {
 		if ($path == "" || $path == "/") {
 			global $FAKEDIRS;
 			$path = $this->datadir.$path;
-			$sharedItems = OC_SHARE::getItemsInFolder($path);
+			$sharedItems = OC_Share::getItemsInFolder($path);
 			if (empty($sharedItems)) {
 				return false;
 			}
@@ -91,12 +89,12 @@ class OC_FILESTORAGE_SHARED extends OC_FILESTORAGE {
 		} else {
 			$source = $this->getSource($path);
 			if ($source) {
-				$storage = OC_FILESYSTEM::getStorage($source);
+				$storage = OC_Filesystem::getStorage($source);
 				$dh = $storage->opendir($this->getInternalPath($source));
 				// Remove any duplicate or trailing '/'
 				$path = rtrim($this->datadir.$path, "/");
 				$path = preg_replace('{(/)\1+}', "/", $path);
-				$modifiedItems = OC_SHARE::getItemsInFolder($source);
+				$modifiedItems = OC_Share::getItemsInFolder($source);
 				if ($modifiedItems && $dh) {
 					global $FAKEDIRS;
 					$sources = array();
@@ -147,7 +145,7 @@ class OC_FILESTORAGE_SHARED extends OC_FILESTORAGE {
 		} else {
 			$source = $this->getSource($path);
 			if ($source) {
-				$storage = OC_FILESYSTEM::getStorage($source);
+				$storage = OC_Filesystem::getStorage($source);
 				return $storage->is_dir($this->getInternalPath($source));
 			}
 		}
@@ -156,7 +154,7 @@ class OC_FILESTORAGE_SHARED extends OC_FILESTORAGE {
 	public function is_file($path) {
 		$source = $this->getSource($path);
 		if ($source) {
-			$storage = OC_FILESYSTEM::getStorage($source);
+			$storage = OC_Filesystem::getStorage($source);
 			return $storage->is_file($this->getInternalPath($source));
 		}
 	}
@@ -181,7 +179,7 @@ class OC_FILESTORAGE_SHARED extends OC_FILESTORAGE {
 		} else {
 			$source = $this->getSource($path);
 			if ($source) {
-				$storage = OC_FILESYSTEM::getStorage($source);
+				$storage = OC_Filesystem::getStorage($source);
 				return $storage->stat($this->getInternalPath($source));
 			}
 		}
@@ -193,7 +191,7 @@ class OC_FILESTORAGE_SHARED extends OC_FILESTORAGE {
 		} else {
 			$source = $this->getSource($path);
 			if ($source) {
-				$storage = OC_FILESYSTEM::getStorage($source);
+				$storage = OC_Filesystem::getStorage($source);
 				return $storage->filetype($this->getInternalPath($source));
 			}
 		}
@@ -206,7 +204,7 @@ class OC_FILESTORAGE_SHARED extends OC_FILESTORAGE {
 		} else {
 			$source = $this->getSource($path);
 			if ($source) {
-				$storage = OC_FILESYSTEM::getStorage($source);
+				$storage = OC_Filesystem::getStorage($source);
 				return $storage->filesize($this->getInternalPath($source));
 			}
 		}
@@ -214,7 +212,7 @@ class OC_FILESTORAGE_SHARED extends OC_FILESTORAGE {
 	
 	public function getFolderSize($path) {
 		if ($path == "" || $path == "/") {
-			$dbpath = $this->datadir;
+			$dbpath = OC_User::getUser()."/files/Share/";
 		} else {
 			$source = $this->getSource($path);
 			$dbpath = $this->getInternalPath($source);
@@ -250,7 +248,7 @@ class OC_FILESTORAGE_SHARED extends OC_FILESTORAGE {
 			}
 			if ($size > 0) {
 				if ($path == "" || $path == "/") {
-					$dbpath = OC_USER::getUser()."/files/Share/";
+					$dbpath = OC_User::getUser()."/files/Share/";
 				} else {
 					$source = $this->getSource($path);
 					$dbpath = $this->getInternalPath($source);
@@ -267,7 +265,7 @@ class OC_FILESTORAGE_SHARED extends OC_FILESTORAGE {
 	}
 	
 	public function is_writeable($path) {
-		if ($path == "" || $path == "/" || OC_SHARE::getPermissions($this->datadir.$path) & OC_SHARE::WRITE) {
+		if ($path == "" || $path == "/" || OC_Share::getPermissions($this->datadir.$path) & OC_Share::WRITE) {
 			return true;
 		} else {
 			return false;
@@ -280,7 +278,7 @@ class OC_FILESTORAGE_SHARED extends OC_FILESTORAGE {
 		} else {
 			$source = $this->getSource($path);
 			if ($source) {
-				$storage = OC_FILESYSTEM::getStorage($source);
+				$storage = OC_Filesystem::getStorage($source);
 				return $storage->file_exists($this->getInternalPath($source));
 			}
 		}
@@ -289,7 +287,7 @@ class OC_FILESTORAGE_SHARED extends OC_FILESTORAGE {
 	public function readfile($path) {
 		$source = $this->getSource($path);
 		if ($source) {
-			$storage = OC_FILESYSTEM::getStorage($source);
+			$storage = OC_Filesystem::getStorage($source);
 			return $storage->readfile($this->getInternalPath($source));
 		}	
 	}
@@ -308,7 +306,7 @@ class OC_FILESTORAGE_SHARED extends OC_FILESTORAGE {
 		} else {
 			$source = $this->getSource($path);
 			if ($source) {
-				$storage = OC_FILESYSTEM::getStorage($source);
+				$storage = OC_Filesystem::getStorage($source);
 				return $storage->filectime($this->getInternalPath($source));
 			}
 		}
@@ -328,7 +326,7 @@ class OC_FILESTORAGE_SHARED extends OC_FILESTORAGE {
 		} else {
 			$source = $this->getSource($path);
 			if ($source) {
-				$storage = OC_FILESYSTEM::getStorage($source);
+				$storage = OC_Filesystem::getStorage($source);
 				return $storage->filemtime($this->getInternalPath($source));
 			}
 		}
@@ -348,7 +346,7 @@ class OC_FILESTORAGE_SHARED extends OC_FILESTORAGE {
 		} else {
 			$source = $this->getSource($path);
 			if ($source) {
-				$storage = OC_FILESYSTEM::getStorage($source);
+				$storage = OC_Filesystem::getStorage($source);
 				return $storage->fileatime($this->getInternalPath($source));
 			}
 		}
@@ -357,7 +355,7 @@ class OC_FILESTORAGE_SHARED extends OC_FILESTORAGE {
 	public function file_get_contents($path) {
 		$source = $this->getSource($path);
 		if ($source) {
-			$storage = OC_FILESYSTEM::getStorage($source);
+			$storage = OC_Filesystem::getStorage($source);
 			return $storage->file_get_contents($this->getInternalPath($source));
 		}
 	}
@@ -366,7 +364,7 @@ class OC_FILESTORAGE_SHARED extends OC_FILESTORAGE {
 		if ($this->is_writeable($path)) {
 			$source = $this->getSource($path);
 			if ($source) {
-				$storage = OC_FILESYSTEM::getStorage($source);
+				$storage = OC_Filesystem::getStorage($source);
 				return $storage->file_put_contents($this->getInternalPath($source), $data);
 			}
 		}
@@ -375,29 +373,29 @@ class OC_FILESTORAGE_SHARED extends OC_FILESTORAGE {
 	public function unlink($path) {
 		$target = $this->datadir.$path;
 		// If the user has delete permission for the item, the source item will be deleted
-		if (OC_SHARE::getPermissions($target) & OC_SHARE::DELETE) {
+		if (OC_Share::getPermissions($target) & OC_Share::DELETE) {
 			$source = $this->getSource($path);
 			if ($source) {
-				$storage = OC_FILESYSTEM::getStorage($source);
+				$storage = OC_Filesystem::getStorage($source);
 				return $storage->unlink($this->getInternalPath($source));
 			}
 		// The item will be removed from the database, but won't be touched on the owner's filesystem
 		} else {
 			// Check if the item is inside a shared folder
-			if (OC_SHARE::getParentFolders($target)) {
+			if (OC_Share::getParentFolders($target)) {
 				// If entry for item already exists
-				if (OC_SHARE::getItem($target)) {
-					OC_SHARE::setTarget($target, "/");
+				if (OC_Share::getItem($target)) {
+					OC_Share::setTarget($target, "/");
 				} else {
-					OC_SHARE::pullOutOfFolder($target, "/");
+					OC_Share::pullOutOfFolder($target, "/");
 					// If this is a folder being deleted, call setTarget in case there are any database entries inside the folder
 					if (self::is_dir($path)) {
-						OC_SHARE::setTarget($target, "/");
+						OC_Share::setTarget($target, "/");
 					}
 				}
 			// Delete the database entry
 			} else {
-				OC_SHARE::unshareFromMySelf($target);
+				OC_Share::unshareFromMySelf($target);
 			}
 		}
 		return true;
@@ -408,21 +406,21 @@ class OC_FILESTORAGE_SHARED extends OC_FILESTORAGE {
 		if ($this->is_writeable($path1)) {
 			$source = $this->getSource($path1);
 			if ($source) {
-				$storage = OC_FILESYSTEM::getStorage($source);
+				$storage = OC_Filesystem::getStorage($source);
 				return $storage->rename($path1, $path2);
 			}
 		// The item will be renamed in the database, but won't be touched on the owner's filesystem
 		} else {
 			$oldTarget = $this->datadir.$path1;
 			$newTarget = $this->datadir.$path2;
-			if (OC_SHARE::getItem($oldTarget)) {
-				OC_SHARE::setTarget($oldTarget, $newTarget);
+			if (OC_Share::getItem($oldTarget)) {
+				OC_Share::setTarget($oldTarget, $newTarget);
 			// There is no entry in the database for the item, it must be inside a shared folder
 			} else {
-				OC_SHARE::pullOutOfFolder($oldTarget, $newTarget);
+				OC_Share::pullOutOfFolder($oldTarget, $newTarget);
 				// If this is a folder being renamed, call setTarget in case there are any database entries inside the folder
 				if (self::is_dir($path1)) {
-					OC_SHARE::setTarget($oldTarget, $newTarget);
+					OC_Share::setTarget($oldTarget, $newTarget);
 				}
 			}
 		}
@@ -445,7 +443,7 @@ class OC_FILESTORAGE_SHARED extends OC_FILESTORAGE {
 	public function fopen($path, $mode) {
 		$source = $this->getSource($path);
 		if ($source) {
-			$storage = OC_FILESYSTEM::getStorage($source);
+			$storage = OC_Filesystem::getStorage($source);
 			return $storage->fopen($this->getInternalPath($source), $mode);
 		}
 	}
@@ -453,7 +451,7 @@ class OC_FILESTORAGE_SHARED extends OC_FILESTORAGE {
 	public function toTmpFile($path) {
 		$source = $this->getSource($path);
 		if ($source) {
-			$storage = OC_FILESYSTEM::getStorage($source);
+			$storage = OC_Filesystem::getStorage($source);
 			return $storage->toTmpFile($this->getInternalPath($source));
 		}
 	}
@@ -462,7 +460,7 @@ class OC_FILESTORAGE_SHARED extends OC_FILESTORAGE {
 		if ($this->is_writeable($path)) {
 			$source = $this->getSource($path);
 			if ($source) {
-				$storage = OC_FILESYSTEM::getStorage($source);
+				$storage = OC_Filesystem::getStorage($source);
 				return $storage->fromTmpFile($tmpFile, $this->getInternalPath($source));
 			}
 		} else {
@@ -473,7 +471,7 @@ class OC_FILESTORAGE_SHARED extends OC_FILESTORAGE {
 	public function fromUploadedFile($tmpPath, $path) {
 		$source = $this->getSource($tmpPath);
 		if ($source) {
-			$storage = OC_FILESYSTEM::getStorage($source);
+			$storage = OC_Filesystem::getStorage($source);
 			return $storage->fromUploadedFile($this->getInternalPath($source), $path);
 		}
 	}
@@ -481,7 +479,7 @@ class OC_FILESTORAGE_SHARED extends OC_FILESTORAGE {
 	public function getMimeType($path) {
 		$source = $this->getSource($path);
 		if ($source) {
-			$storage = OC_FILESYSTEM::getStorage($source);
+			$storage = OC_Filesystem::getStorage($source);
 			return $storage->getMimeType($this->getInternalPath($source));
 		}
 	}
@@ -489,7 +487,7 @@ class OC_FILESTORAGE_SHARED extends OC_FILESTORAGE {
 	public function delTree($path) {
 		$source = $this->getSource($path);
 		if ($source) {
-			$storage = OC_FILESYSTEM::getStorage($source);
+			$storage = OC_Filesystem::getStorage($source);
 			return $storage->delTree($this->getInternalPath($source));
 		}
 	}
@@ -497,7 +495,7 @@ class OC_FILESTORAGE_SHARED extends OC_FILESTORAGE {
 	public function find($path) {
 		$source = $this->getSource($path);
 		if ($source) {
-			$storage = OC_FILESYSTEM::getStorage($source);
+			$storage = OC_Filesystem::getStorage($source);
 			return $storage->find($this->getInternalPath($source));
 		}
 	}
@@ -505,7 +503,7 @@ class OC_FILESTORAGE_SHARED extends OC_FILESTORAGE {
 	public function getTree($path) {
 		$source = $this->getSource($path);
 		if ($source) {
-			$storage = OC_FILESYSTEM::getStorage($source);
+			$storage = OC_Filesystem::getStorage($source);
 			return $storage->getTree($this->getInternalPath($source));
 		}
 	}
@@ -513,7 +511,7 @@ class OC_FILESTORAGE_SHARED extends OC_FILESTORAGE {
 	public function hash($type, $path, $raw) {
 		$source = $this->getSource($path);
 		if ($source) {
-			$storage = OC_FILESYSTEM::getStorage($source);
+			$storage = OC_Filesystem::getStorage($source);
 			return $storage->hash($type, $this->getInternalPath($source), $raw);
 		}
 	}
@@ -521,7 +519,7 @@ class OC_FILESTORAGE_SHARED extends OC_FILESTORAGE {
 	public function free_space($path) {
 		$source = $this->getSource($path);
 		if ($source) {
-			$storage = OC_FILESYSTEM::getStorage($source);
+			$storage = OC_Filesystem::getStorage($source);
 			return $storage->free_space($this->getInternalPath($source));
 		}
 	}
diff --git a/apps/media/ajax/api.php b/apps/media/ajax/api.php
index 84d5dd17882..b86c69d0beb 100644
--- a/apps/media/ajax/api.php
+++ b/apps/media/ajax/api.php
@@ -52,22 +52,21 @@ if(!isset($arguments['album'])){
 if(!isset($arguments['search'])){
 	$arguments['search']='';
 }
-OC_MEDIA_COLLECTION::$uid=OC_USER::getUser();
+OC_MEDIA_COLLECTION::$uid=OC_User::getUser();
 if($arguments['action']){
 	switch($arguments['action']){
 		case 'delete':
 			$path=$arguments['path'];
 			OC_MEDIA_COLLECTION::deleteSongByPath($path);
-			$paths=explode(PATH_SEPARATOR,OC_PREFERENCES::getValue(OC_USER::getUser(),'media','paths',''));
+			$paths=explode(PATH_SEPARATOR,OC_Preferences::getValue(OC_User::getUser(),'media','paths',''));
 			if(array_search($path,$paths)!==false){
 				unset($paths[array_search($path,$paths)]);
-				OC_PREFERENCES::setValue(OC_USER::getUser(),'media','paths',implode(PATH_SEPARATOR,$paths));
+				OC_Preferences::setValue(OC_User::getUser(),'media','paths',implode(PATH_SEPARATOR,$paths));
 			}
 		case 'get_collection':
 			$artists=OC_MEDIA_COLLECTION::getArtists();
 			foreach($artists as &$artist){
 				$artist['albums']=OC_MEDIA_COLLECTION::getAlbums($artist['artist_id']);
-				$artistHasSongs=false;
 				foreach($artist['albums'] as &$album){
 					$album['songs']=OC_MEDIA_COLLECTION::getSongs($artist['artist_id'],$album['album_id']);
 				}
@@ -78,11 +77,11 @@ if($arguments['action']){
 		case 'scan':
 			set_time_limit(0); //recursive scan can take a while
 			$path=$arguments['path'];
-			if(OC_FILESYSTEM::is_dir($path)){
-				$paths=explode(PATH_SEPARATOR,OC_PREFERENCES::getValue(OC_USER::getUser(),'media','paths',''));
+			if(OC_Filesystem::is_dir($path)){
+				$paths=explode(PATH_SEPARATOR,OC_Preferences::getValue(OC_User::getUser(),'media','paths',''));
 				if(array_search($path,$paths)===false){
 					$paths[]=$path;
-					OC_PREFERENCES::setValue(OC_USER::getUser(),'media','paths',implode(PATH_SEPARATOR,$paths));
+					OC_Preferences::setValue(OC_User::getUser(),'media','paths',implode(PATH_SEPARATOR,$paths));
 				}
 			}
 			echo OC_MEDIA_SCANNER::scanFolder($path);
@@ -103,7 +102,7 @@ if($arguments['action']){
 		case 'play':
 			ob_end_clean();
 			
-			$ftype=OC_FILESYSTEM::getMimeType( $arguments['path'] );
+			$ftype=OC_Filesystem::getMimeType( $arguments['path'] );
 			
 			$songId=OC_MEDIA_COLLECTION::getSongByPath($arguments['path']);
 			OC_MEDIA_COLLECTION::registerPlay($songId);
@@ -112,9 +111,9 @@ if($arguments['action']){
 			header('Expires: 0');
 			header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
 			header('Pragma: public');
-			header('Content-Length: '.OC_FILESYSTEM::filesize($arguments['path']));
+			header('Content-Length: '.OC_Filesystem::filesize($arguments['path']));
 			
-			OC_FILESYSTEM::readfile($arguments['path']);
+			OC_Filesystem::readfile($arguments['path']);
 			exit;
 	}
 }
diff --git a/apps/media/ajax/autoupdate.php b/apps/media/ajax/autoupdate.php
index 97733398225..ded1fd02bc3 100644
--- a/apps/media/ajax/autoupdate.php
+++ b/apps/media/ajax/autoupdate.php
@@ -33,7 +33,7 @@ error_log($_GET['autoupdate']);
 $autoUpdate=(isset($_GET['autoupdate']) and $_GET['autoupdate']=='true');
 error_log((integer)$autoUpdate);
 
-OC_PREFERENCES::setValue(OC_USER::getUser(),'media','autoupdate',(integer)$autoUpdate);
+OC_Preferences::setValue(OC_User::getUser(),'media','autoupdate',(integer)$autoUpdate);
 
 echo json_encode( array( "status" => "success", "data" => $autoUpdate));
 ?>
\ No newline at end of file
diff --git a/apps/media/appinfo/app.php b/apps/media/appinfo/app.php
index a41e228be4a..b29b842d23a 100644
--- a/apps/media/appinfo/app.php
+++ b/apps/media/appinfo/app.php
@@ -22,12 +22,42 @@
 
 require_once('apps/media/lib_media.php');
 
-if(OC_APP::getCurrentApp()=='files'){
-	OC_UTIL::addScript('media','files');
+if(OC_App::getCurrentApp()=='files'){
+	OC_Util::addScript('media','files');
 }
 
-OC_APP::register( array( 'order' => 3, 'id' => 'media', 'name' => 'Media' ));
+OC_App::register( array( 'order' => 3, 'id' => 'media', 'name' => 'Media' ));
 
-OC_APP::addNavigationEntry( array( 'id' => 'media_index', 'order' => 2, 'href' => OC_HELPER::linkTo( 'media', 'index.php' ), 'icon' => OC_HELPER::imagePath( 'media', 'media.png' ), 'name' => 'Media' ));
-OC_APP::addSettingsPage( array( 'id' => 'media_settings', 'order' => 5, 'href' => OC_HELPER::linkTo( 'media', 'settings.php' ), 'name' => 'Media', 'icon' => OC_HELPER::imagePath( 'media', 'media.png' )));
+OC_App::addNavigationEntry( array( 'id' => 'media_index', 'order' => 2, 'href' => OC_Helper::linkTo( 'media', 'index.php' ), 'icon' => OC_Helper::imagePath( 'media', 'media.png' ), 'name' => 'Media' ));
+OC_App::addSettingsPage( array( 'id' => 'media_settings', 'order' => 5, 'href' => OC_Helper::linkTo( 'media', 'settings.php' ), 'name' => 'Media', 'icon' => OC_Helper::imagePath( 'media', 'media.png' )));
+
+// add subnavigations
+$entry = array(
+	'id' => "media_playlist",
+	'order'=>1,
+	'href' => '#playlist',
+	'name' => 'Playlist'
+);
+OC_App::addNavigationSubEntry( "media_index", $entry);
+$entry = array(
+	'id' => "media_collection",
+	'order'=>1,
+	'href' => '#collection',
+	'name' => 'Collection'
+);
+OC_App::addNavigationSubEntry( "media_index", $entry);
+// $entry = array(
+// 	'id' => "media_recent",
+// 	'order'=>1,
+// 	'href' => '#recent',
+// 	'name' => 'Most Recent'
+// );
+// OC_App::addNavigationSubEntry( "media_index", $entry);
+// $entry = array(
+// 	'id' => "media_mostplayer",
+// 	'order'=>1,
+// 	'href' => '#mostplayed',
+// 	'name' => 'Most Played'
+// );
+// OC_App::addNavigationSubEntry( "media_index", $entry);
 ?>
diff --git a/apps/media/css/music.css b/apps/media/css/music.css
index 92a4ea5e147..067da79446d 100644
--- a/apps/media/css/music.css
+++ b/apps/media/css/music.css
@@ -3,7 +3,15 @@
 li button.right.prettybutton{font-size:1em;}
 #collection{padding-top:1em;position:relative;width:70ex;float:left;}
 #collection li.album,#collection li.song{margin-left:3ex;}
-#playlist{margin-left:72ex;}
-#playlist li.current{background-color:#ccc;}
+#playlist{width:100%;border-spacing:0;}
+#playlist th{background-color:#ccc; text-align:left; font-size:1.2em; padding:0.2em}
+#playlist tr.selected{background-color:#eee;}
+#playlist tr.current{background-color:#ccc;}
+#playlist td.time, #playlist th.time{text-align:right; padding-right:1em;}
 #collection li button{float:right;}
 #collection li,#playlist li{list-style-type:none;}
+.template{display:none}
+
+#collection{display:none}/*hide the collection initially*/
+#collection li{padding-right:10px;}
+img.remove{float:right;};
diff --git a/apps/media/css/player.css b/apps/media/css/player.css
index 7acb9f34c1b..94dd4d63605 100644
--- a/apps/media/css/player.css
+++ b/apps/media/css/player.css
@@ -1,4 +1,4 @@
-#jp-interface{position:fixed;z-index:100;width:25em;left:201px;top:-20px;height:80px;border-bottom:none;}
+#jp-interface{position:fixed;z-index:100;width:25em;left:201px;top:-20px;height:60px;border-bottom:none;}
 #jp-interface div.player{height:0px}
 #jp-interface ul.jp-controls{list-style-type:none;padding:0;}
 #jp-interface ul.jp-controls li{display:inline;}
diff --git a/apps/media/index.php b/apps/media/index.php
index 26e008acab5..43423d27de6 100644
--- a/apps/media/index.php
+++ b/apps/media/index.php
@@ -25,27 +25,33 @@
 require_once('../../lib/base.php');
 
 // Check if we are a user
-if( !OC_USER::isLoggedIn()){
-	header( "Location: ".OC_HELPER::linkTo( '', 'index.php' ));
+if( !OC_User::isLoggedIn()){
+	header( "Location: ".OC_Helper::linkTo( '', 'index.php' ));
 	exit();
 }
 
 require_once('lib_collection.php');
 require_once('lib_scanner.php');
-require_once('template.php');
 
-OC_UTIL::addScript('media','player');
-OC_UTIL::addScript('media','music');
-OC_UTIL::addScript('media','jquery.jplayer.min');
-OC_UTIL::addStyle('media','player');
-OC_UTIL::addStyle('media','music');
+OC_Util::addScript('media','player');
+OC_Util::addScript('media','music');
+OC_Util::addScript('media','playlist');
+OC_Util::addScript('media','collection');
+OC_Util::addScript('media','jquery.jplayer.min');
+OC_Util::addStyle('media','player');
+OC_Util::addStyle('media','music');
 
-OC_APP::setActiveNavigationEntry( 'media_index' );
+OC_App::setActiveNavigationEntry( 'media_playlist' );
 
-$tmpl = new OC_TEMPLATE( 'media', 'music', 'user' );
+$tmpl = new OC_Template( 'media', 'music', 'user' );
+
+$player = new OC_Template( 'media', 'player');
+$playlist = new OC_Template( 'media', 'playlist');
+$collection= new OC_Template( 'media', 'collection');
 
-$player = new OC_TEMPLATE( 'media', 'player');
 $tmpl->assign('player',$player->fetchPage());
+$tmpl->assign('playlist',$playlist->fetchPage());
+$tmpl->assign('collection',$collection->fetchPage());
 $tmpl->printPage();
 ?>
  
diff --git a/apps/media/js/collection.js b/apps/media/js/collection.js
new file mode 100644
index 00000000000..b8fd515ba60
--- /dev/null
+++ b/apps/media/js/collection.js
@@ -0,0 +1,150 @@
+Collection={
+	artists:[],
+	loaded:false,
+	loading:false,
+	loadedListeners:[],
+	load:function(ready){
+		if(ready){
+			Collection.loadedListeners.push(ready);
+		}
+		if(!Collection.loading){
+			Collection.loading=true;
+			$.ajax({
+				url: OC.linkTo('media','ajax/api.php')+'?action=get_collection',
+				dataType: 'json',
+				success: function(collection){
+					Collection.artists=collection;
+					
+					//set the album and artist fieds for the songs
+					for(var i=0;i<collection.length;i++){
+						var artist=collection[i];
+						for(var j=0;j<artist.albums.length;j++){
+							var album=artist.albums[j]
+							for(var w=0;w<album.songs.length;w++){
+								album.songs[w].album_name=album.album_name;
+								album.songs[w].artist_name=artist.artist_name;
+							}
+						}
+					}
+					
+					Collection.loaded=true;
+					Collection.loading=false;
+					for(var i=0;i<Collection.loadedListeners.length;i++){
+						Collection.loadedListeners[i]();
+					}
+					
+				}
+			});
+		}
+	},
+	display:function(){
+		if(Collection.parent){
+			Collection.parent.show();
+		}
+		if(!Collection.loaded){
+			Collection.load(Collection.display)
+		}else{
+			if(Collection.parent){
+				Collection.parent.children('li.artist').remove();
+				var template=Collection.parent.children('li.template');
+				for(var i=0;i<Collection.artists.length;i++){
+					var artist=Collection.artists[i];
+					var li=template.clone();
+					li.data('artist',artist);
+					li.removeClass('template');
+					li.addClass('artist');
+					li.data('type','artist');
+					li.children('span').text(artist.artist_name);
+					Collection.addButtons(li);
+					Collection.parent.append(li);
+				}
+			}
+		}
+	},
+	parent:null,
+	hide:function(){
+		if(Collection.parent){
+			Collection.parent.hide();
+		}
+	},
+	showAlbums:function(artistLi){
+		$('ul.albums').parent().removeClass('active');
+		$('ul.albums').remove();
+		var artist=artistLi.data('artist');
+		if(artist){
+			var template=Collection.parent.children('li.template');
+			var ul=$('<ul class="albums"></ul>');
+			for(var i=0;i<artist.albums.length;i++){
+				var li=template.clone();
+				var album=artist.albums[i];
+				li.removeClass('template');
+				li.addClass('album');
+				li.data('album',album);
+				li.data('type','album');
+				li.children('span').text(album.album_name);
+				Collection.addButtons(li);
+				ul.append(li);
+			}
+			artistLi.append(ul);
+		}
+	},
+	showSongs:function(albumLi){
+		$('ul.songs').parent().removeClass('active');
+		$('ul.songs').remove();
+		var album=albumLi.data('album');
+		var template=Collection.parent.children('li.template');
+		var ul=$('<ul class="songs"></ul>');
+		for(var i=0;i<album.songs.length;i++){
+			var li=template.clone();
+			var song=album.songs[i];
+			li.removeClass('template');
+			li.addClass('song');
+			li.data('song',song);
+			li.data('type','song');
+			li.children('span').text(song.song_name);
+			Collection.addButtons(li);
+			ul.append(li);
+		}
+		albumLi.append(ul);
+	},
+	registerPlay:function(){
+		var item=PlayList.items[PlayList.current];
+		for(var i=0;i<Collection.artists.length;i++){
+			var artist=Collection.artists[i];
+			for(var j=0;j<artist.albums.length;j++){
+				var album=artist.albums[j]
+				for(var w=0;w<album.songs.length;w++){
+					var song=album.songs[w];
+					if(song.song_name==item.name && song.artist_name==item.artist && song.album_name==item.album){
+						song.song_playcount++;
+					}
+				}
+			}
+		}
+	},
+	addButtons:function(parent){
+		parent.children('button.add').click(function(){
+			var type=$(this).parent().data('type');
+			PlayList.add($(this).parent().data(type));
+		});
+		parent.children('button.play').click(function(){
+			var type=$(this).parent().data('type');
+			var oldSize=PlayList.items.length;
+			PlayList.add($(this).parent().data(type));
+			PlayList.play(oldSize);
+		});
+	}
+}
+
+$(document).ready(function(){
+	Collection.parent=$('#collection');
+	Collection.load();
+	$('#collection li.artist>span').live('click',function(){
+		$(this).parent().toggleClass('active');
+		Collection.showAlbums($(this).parent());
+	});
+	$('#collection li.album>span').live('click',function(){
+		$(this).parent().toggleClass('active');
+		Collection.showSongs($(this).parent());
+	});
+});
diff --git a/apps/media/js/music.js b/apps/media/js/music.js
index ba34e66c3ba..b2464c3842f 100644
--- a/apps/media/js/music.js
+++ b/apps/media/js/music.js
@@ -1,85 +1,24 @@
 $(document).ready(function(){
 	//load the collection
-	$.ajax({
-		url: OC.linkTo('media','ajax/api.php')+'?action=get_collection',
-		dataType: 'json',
-		success: function(collection){
-			displayCollection(collection);
-		}
+	$('#plugins a[href="#collection"]').click(function(){
+		$('#plugins li.subentry a.active').removeClass('active');
+		$(this).addClass('active');
+		PlayList.hide();
+		Collection.display();
 	});
-});
-
-function displayCollection(collection){
-	$('#collection').data('collection',collection);
-	$.each(collection,function(index,artist){
-		var artistNode=$('<li class="artist">'+artist.artist_name+'<button class="add">Add</button><ul/></li>');
-		artistNode.data('name',artist.artist_name);
-		artistNode.data('stuff',artist);
-		$('#collection>ul').append(artistNode);
-		$.each(artist.albums,function(index,album){
-			var albumNode=$('<li class="album">'+album.album_name+'<button class="add">Add</button><ul/></li>');
-			albumNode.data('name',album.album_name);
-			albumNode.data('stuff',album);
-			artistNode.children('ul').append(albumNode);
-			$.each(album.songs,function(index,song){
-				var songNode=$('<li class="song">'+song.song_name+'<button class="add">Add</button></li>');
-				song.artist_name=artist.artist_name;
-				song.album_name=album.album_name;
-				songNode.data('name',song.song_name);
-				songNode.data('stuff',song);
-				albumNode.children('ul').append(songNode);
-			});
-		});
-	});
-	$('li.album').hide();
-	$('li.song').hide();
-	$('li.artist').click(function(){
-		$(this).children().children().slideToggle();
-		return false;
-	});
-	$('li.album').click(function(){
-		$(this).children().children().slideToggle();
-		return false;
-	});
-	$('li.song').click(function(){
-		return false;
+	$('#plugins a[href="#playlist"]').click(function(){
+		$('#plugins li.subentry a.active').removeClass('active');
+		$(this).addClass('active');
+		PlayList.render();
+		Collection.hide();
 	});
-	$('li>button.add').click(function(){
-		PlayList.add($(this).parent().data('stuff'));
-		PlayList.render($('#playlist'));
-		return false;
-	});
-	if(window.location.href.indexOf('#')>-1){//autoplay passed arist/album/song
-		var vars=getUrlVars();
-		var play;
-		if(vars['artist']){
-			$.each(collection,function(index,artist){
-				if(artist.artist_name==vars['artist']){
-					play=artist;
-					if(vars['album']){
-						$.each(artist.albums,function(index,album){
-							if(album.album_name==vars['album']){
-								play=album;
-								if(vars['song']){
-									$.each(album.songs,function(index,song){
-										if(song.song_name==vars['song']){
-											play=song;
-										}
-									});
-								}
-							}
-						});
-					}
-				}
-			});
-		}
-		PlayList.add(play);
-		PlayList.play();
-	}else{
-		PlayList.init();
+	var tab=window.location.href.slice(window.location.href.indexOf('#') + 1);
+	if(tab=='collection'){
+		$('#plugins a[href="#collection"]').trigger('click');
 	}
-	
-}
+});
+
+
 
 function getUrlVars(){
 	var vars = [], hash;
@@ -94,7 +33,7 @@ function getUrlVars(){
 }
 
 function musicTypeFromFile(file){
-	var extention=file.substr(file.indexOf('.')+1);
+	var extention=file.split('.').pop();
 	if(extention=='ogg'){
 		return 'oga'
 	}
diff --git a/apps/media/js/player.js b/apps/media/js/player.js
index f76628110a8..2e910bc0d59 100644
--- a/apps/media/js/player.js
+++ b/apps/media/js/player.js
@@ -3,13 +3,13 @@ var PlayList={
 	current:-1,
 	items:[],
 	player:null,
-	parent:null,
 	next:function(){
 		var next=PlayList.current+1;
 		if(next>=PlayList.items.length){
 			next=0;
 		}
 		PlayList.play(next);
+		PlayList.render();
 	},
 	previous:function(){
 		var next=PlayList.current-1;
@@ -17,6 +17,7 @@ var PlayList={
 			next=PlayList.items.length-1;
 		}
 		PlayList.play(next);
+		PlayList.render();
 	},
 	play:function(index){
 		if(index==null){
@@ -30,7 +31,11 @@ var PlayList={
 					PlayList.init(PlayList.items[index].type,PlayList.play);
 				}else{
 					PlayList.player.jPlayer("setMedia", PlayList.items[PlayList.current]);
+					PlayList.items[index].playcount++;
 					PlayList.player.jPlayer("play");
+					if(Collection){
+						Collection.registerPlay();
+					}
 				}
 			}else{
 				PlayList.init(PlayList.items[index].type,PlayList.play);
@@ -66,6 +71,9 @@ var PlayList={
 		});
 	},
 	add:function(song){
+		if(!song){
+			return;
+		}
 		if(song.substr){//we are passed a string, asume it's a url to a song
 			PlayList.addFile(song);
 		}
@@ -81,7 +89,7 @@ var PlayList={
 		}
 		if(song.song_name){
 			var type=musicTypeFromFile(song.song_path);
-			var item={name:song.song_name,type:type,artist:song.artist_name,album:song.album_name};
+			var item={name:song.song_name,type:type,artist:song.artist_name,album:song.album_name,length:song.song_length,playcount:song.song_playcount};
 			item[type]=PlayList.urlBase+encodeURIComponent(song.song_path);
 			PlayList.items.push(item);
 		}
@@ -92,30 +100,9 @@ var PlayList={
 		item[type]=PlayList.urlBase+encodeURIComponent(path);
 		PlayList.items.push(item);
 	},
-	render:function(parent){//parent should be an ul element
-		if(parent){
-			PlayList.parent=parent;
-		}else{
-			parent=PlayList.parent;
-		}
-		if(parent){
-			parent.empty();
-			for(var i=0;i<PlayList.items.length;i++){
-				var song=PlayList.items[i];
-				var item=$('<li>'+song.artist+' - '+song.album+' - '+song.name+'</li>');
-				item.data('artist',song.artist);
-				item.data('album',song.album);
-				item.data('name',song.name);
-				item.data('index',i);
-				item.click(function(){
-					PlayList.play($(this).data('index'));
-					PlayList.render();
-				});
-				if(i==PlayList.current){
-					item.addClass('current');
-				}
-				parent.append(item);
-			}
-		}
-	}
+	remove:function(index){
+		PlayList.items.splice(index,1);
+		PlayList.render();
+	},
+	render:function(){}
 }
diff --git a/apps/media/js/playlist.js b/apps/media/js/playlist.js
new file mode 100644
index 00000000000..54fe5b792e7
--- /dev/null
+++ b/apps/media/js/playlist.js
@@ -0,0 +1,141 @@
+PlayList.render=function(){
+	$('#playlist').show();
+	PlayList.parent.empty();
+	for(var i=0;i<PlayList.items.length;i++){
+		var tr=PlayList.template.clone();
+		var item=PlayList.items[i];
+		if(i==PlayList.current){
+			tr.addClass('current');
+		}
+		tr.removeClass('template');
+		tr.data('name',item.name);
+		tr.data('artist',item.artist);
+		tr.data('album',item.album);
+		tr.data('time',item.length);
+		tr.data('plays',item.playcount);
+		tr.children('td.name').children('span').text(item.name);
+		tr.children('td.artist').text(item.artist);
+		tr.children('td.album').text(item.album);
+		var secconds=(item.length%60);
+		if(secconds<10){
+			secconds='0'+secconds;
+		}
+		var length=Math.floor(item.length/60)+':'+secconds;
+		tr.children('td.time').text(length);
+		tr.children('td.plays').text(item.playcount);
+		tr.data('index',i);
+		tr.click(function(){
+			PlayList.play($(this).data('index'));
+			PlayList.render();
+		});
+		tr.hover(function(){
+			var button=$('<img class="remove" title="Remove"/>');
+			button.attr('src',OC.imagePath('core','actions/delete'));
+			$(this).children().last().append(button);
+			button.click(function(event){
+				event.stopPropagation();
+				event.preventDefault();
+				var index=$(this).parent().parent().data('index');
+				PlayList.remove(index);
+			});
+		},function(){
+			$(this).children().last().children('img.remove').remove();
+		});
+		tr.children('td.name').children('input').click(function(event){
+			event.stopPropagation();
+			if($(this).attr('checked')){
+				$(this).parent().parent().addClass('selected');
+				if($('tbody td.name input:checkbox').length==$('tbody td.name input:checkbox:checked').length){
+					$('#selectAll').attr('checked',true);
+				}
+			}else{
+				$(this).parent().parent().removeClass('selected');
+				$('#selectAll').attr('checked',false);
+			}
+			procesSelection();
+		});
+		PlayList.parent.append(tr);
+	}
+}
+PlayList.getSelected=function(){
+	return $('tbody td.name input:checkbox:checked').parent().parent();
+}
+PlayList.hide=function(){
+	$('#playlist').hide();
+}
+
+$(document).ready(function(){
+	PlayList.parent=$('#playlist tbody');
+	PlayList.template=$('#playlist tr.template');
+	$('#selectAll').click(function(){
+		if($(this).attr('checked')){
+			// Check all
+			$('tbody td.name input:checkbox').attr('checked', true);
+			$('tbody td.name input:checkbox').parent().parent().addClass('selected');
+		}else{
+			// Uncheck all
+			$('tbody td.name input:checkbox').attr('checked', false);
+			$('tbody td.name input:checkbox').parent().parent().removeClass('selected');
+		}
+		procesSelection();
+	});
+});
+
+function procesSelection(){
+	var selected=PlayList.getSelected();
+	if(selected.length==0){
+		$('th.name span').text('Name');
+		$('th.artist').text('Artist');
+		$('th.album').text('Album');
+		$('th.time').text('Time');
+		$('th.plays').empty();
+		$('th.plays').text('Plays');
+	}else{
+		var name=selected.length+' selected';
+		var artist=$(selected[0]).data('artist');
+		var album=$(selected[0]).data('album');
+		var time=$(selected[0]).data('time');
+		var plays=$(selected[0]).data('plays');
+		for(var i=1;i<selected.length;i++){
+			var item=$(selected[i]);
+			if(artist!='mixed' && item.data('artist')!==artist){
+				artist='mixed'
+			}
+			if(album!='mixed' && item.data('album')!==album){
+				album='mixed'
+			}
+			if(time!='mixed' && item.data('time')!==time){
+				time='mixed'
+			}
+			if(plays!='mixed' && item.data('plays')!==plays){
+				plays='mixed'
+			}
+		}
+		$('th.name span').text(name);
+		$('th.artist').text(artist);
+		$('th.album').text(album);
+		if(time!='mixed'){
+			var secconds=(time%60);
+			if(secconds<10){
+				secconds='0'+secconds;
+			}
+			var time=Math.floor(time/60)+':'+secconds;
+		}
+		$('th.time').text(time);
+		$('th.plays').text(plays);
+		var button=$('<img class="remove" title="Remove"/>');
+		button.attr('src',OC.imagePath('core','actions/delete'));
+		$('th.plays').append(button);
+		button.click(function(event){
+			event.stopPropagation();
+			event.preventDefault();
+			PlayList.getSelected().each(function(index,element){
+				var index=$(element).data('index');
+				PlayList.items[index]=null;
+			});
+			PlayList.items=PlayList.items.filter(function(item){return item!==null});
+			PlayList.render();
+			procesSelection();
+		});
+	}
+}
\ No newline at end of file
diff --git a/apps/media/lib_ampache.php b/apps/media/lib_ampache.php
index 3cd9bd4ab26..97dc004e218 100644
--- a/apps/media/lib_ampache.php
+++ b/apps/media/lib_ampache.php
@@ -319,11 +319,11 @@ class OC_MEDIA_AMPACHE{
 			return;
 		}
 		if($song=OC_MEDIA_COLLECTION::getSong($params['song'])){
-			OC_UTIL::setupFS($song["song_user"]);
+			OC_Util::setupFS($song["song_user"]);
 
-			header('Content-type: '.OC_FILESYSTEM::getMimeType($song['song_path']));
+			header('Content-type: '.OC_Filesystem::getMimeType($song['song_path']));
 			header('Content-Length: '.$song['song_size']);
-			OC_FILESYSTEM::readfile($song['song_path']);
+			OC_Filesystem::readfile($song['song_path']);
 		}
 	}
 	
diff --git a/apps/media/lib_collection.php b/apps/media/lib_collection.php
index 278e450b778..5a16aaee848 100644
--- a/apps/media/lib_collection.php
+++ b/apps/media/lib_collection.php
@@ -125,10 +125,10 @@ class OC_MEDIA_COLLECTION{
 		}
 		$query=OC_DB::prepare("SELECT DISTINCT *PREFIX*media_artists.artist_name AS name , *PREFIX*media_artists.artist_id AS id FROM *PREFIX*media_artists
 			INNER JOIN *PREFIX*media_songs ON *PREFIX*media_artists.artist_id=*PREFIX*media_songs.song_artist WHERE artist_name LIKE ? AND *PREFIX*media_songs.song_user=?");
-		$artists=$query->execute(array($search,OC_USER::getUser()))->fetchAll();
+		$artists=$query->execute(array($search,OC_User::getUser()))->fetchAll();
 		$result=array();
 		foreach($artists as $artist){
-			$result[$artist['id']]=array('artist_name'=>$artist['name'],'artist_id'=>$artist['id']);
+			$result[]=array('artist_name'=>$artist['name'],'artist_id'=>$artist['id']);
 		}
 		return $result;
 	}
@@ -179,7 +179,7 @@ class OC_MEDIA_COLLECTION{
 		$result=array();
 		foreach($albums as $album){
 			if(count(self::getSongs($album['album_artist'],$album['album_id']))){
-				$result[$album['album_id']]=$album;
+				$result[]=$album;
 			}
 		}
 		return $result;
diff --git a/apps/media/lib_media.php b/apps/media/lib_media.php
index 9c3d0622360..67d111936f1 100644
--- a/apps/media/lib_media.php
+++ b/apps/media/lib_media.php
@@ -22,20 +22,20 @@
 */
 
 //we need to have the sha256 hash of passwords for ampache
-OC_HOOK::connect('OC_USER','post_login','OC_MEDIA','loginListener');
+OC_Hook::connect('OC_User','post_login','OC_MEDIA','loginListener');
 
 //connect to the filesystem for auto updating if configured
-if(OC_PREFERENCES::getValue(OC_USER::getUser(),'media','autoupdate',false)){
-	OC_HOOK::connect('OC_FILESYSTEM','post_write','OC_MEDIA','updateFile');
+if(OC_Preferences::getValue(OC_User::getUser(),'media','autoupdate',false)){
+	OC_Hook::connect('OC_Filesystem','post_write','OC_MEDIA','updateFile');
 }
 
 //listen for file deletions to clean the database if a song is deleted
-OC_HOOK::connect('OC_FILESYSTEM','delete','OC_MEDIA','deleteFile');
+OC_Hook::connect('OC_Filesystem','delete','OC_MEDIA','deleteFile');
 
 class OC_MEDIA{
 	/**
 	 * get the sha256 hash of the password needed for ampache
-	 * @param array $params, parameters passed from OC_HOOK
+	 * @param array $params, parameters passed from OC_Hook
 	 */
 	public static function loginListener($params){
 		if(isset($_POST['user']) and $_POST['password']){
@@ -56,7 +56,7 @@ class OC_MEDIA{
 	 */
 	public static function updateFile($params){
 		$path=$params['path'];
-		$folderNames=explode(PATH_SEPARATOR,OC_PREFERENCES::getValue(OC_USER::getUser(),'media','paths',''));
+		$folderNames=explode(PATH_SEPARATOR,OC_Preferences::getValue(OC_User::getUser(),'media','paths',''));
 		foreach($folderNames as $folder){
 			if(substr($path,0,strlen($folder))==$folder){
 				require_once 'lib_scanner.php';
@@ -82,7 +82,7 @@ class OC_MEDIA{
 	}
 }
 
-class OC_MediaSearchProvider extends OC_SearchProvider{
+class OC_MediaSearchProvider extends OC_Search_Provider{
 	function search($query){
 		require_once('lib_collection.php');
 		$artists=OC_MEDIA_COLLECTION::getArtists($query);
@@ -90,18 +90,18 @@ class OC_MediaSearchProvider extends OC_SearchProvider{
 		$songs=OC_MEDIA_COLLECTION::getSongs(0,0,$query);
 		$results=array();
 		foreach($artists as $artist){
-			$results[]=new OC_SearchResult($artist['artist_name'],'',OC_HELPER::linkTo( 'apps/media', 'index.php#artist='.urlencode($artist['artist_name']) ),'Music');
+			$results[]=new OC_Search_Result($artist['artist_name'],'',OC_Helper::linkTo( 'apps/media', 'index.php#artist='.urlencode($artist['artist_name']) ),'Music');
 		}
 		foreach($albums as $album){
 			$artist=urlencode(OC_MEDIA_COLLECTION::getArtistName($album['album_artist']));
-			$results[]=new OC_SearchResult($album['album_name'],'',OC_HELPER::linkTo( 'apps/media', 'index.php#artist='.$artist.'&album='.urlencode($album['album_name']) ),'Music');
+			$results[]=new OC_Search_Result($album['album_name'],'',OC_Helper::linkTo( 'apps/media', 'index.php#artist='.$artist.'&album='.urlencode($album['album_name']) ),'Music');
 		}
 		foreach($songs as $song){
 			$minutes=floor($song['song_length']/60);
 			$secconds=$song['song_length']%60;
 			$artist=urlencode(OC_MEDIA_COLLECTION::getArtistName($song['song_artist']));
 			$album=urlencode(OC_MEDIA_COLLECTION::getalbumName($song['song_album']));
-			$results[]=new OC_SearchResult($song['song_name'],"$minutes:$secconds",OC_HELPER::linkTo( 'apps/media', 'index.php#artist='.$artist.'&album='.$album.'&song='.urlencode($song['song_name']) ),'Music');
+			$results[]=new OC_Search_Result($song['song_name'],"$minutes:$secconds",OC_Helper::linkTo( 'apps/media', 'index.php#artist='.$artist.'&album='.$album.'&song='.urlencode($song['song_name']) ),'Music');
 		}
 		return $results;
 	}
diff --git a/apps/media/lib_scanner.php b/apps/media/lib_scanner.php
index 6ad04e7a1be..e3cb2f051ce 100644
--- a/apps/media/lib_scanner.php
+++ b/apps/media/lib_scanner.php
@@ -37,15 +37,15 @@ class OC_MEDIA_SCANNER{
 	 * @return int the number of songs found
 	 */
 	public static function scanFolder($path){
-		if (OC_FILESYSTEM::is_dir($path)) {
+		if (OC_Filesystem::is_dir($path)) {
 			$songs=0;
-			if ($dh = OC_FILESYSTEM::opendir($path)) {
+			if ($dh = OC_Filesystem::opendir($path)) {
 				while (($filename = readdir($dh)) !== false) {
 					if($filename<>'.' and $filename<>'..' and substr($filename,0,1)!='.'){
 						$file=$path.'/'.$filename;
-						if(OC_FILESYSTEM::is_dir($file)){
+						if(OC_Filesystem::is_dir($file)){
 							$songs+=self::scanFolder($file);
-						}elseif(OC_FILESYSTEM::is_file($file)){
+						}elseif(OC_Filesystem::is_file($file)){
 							if(self::scanFile($file)){
 								$songs++;
 							}
@@ -53,7 +53,7 @@ class OC_MEDIA_SCANNER{
 					}
 				}
 			}
-		}elseif(OC_FILESYSTEM::is_file($path)){
+		}elseif(OC_Filesystem::is_file($path)){
 			$songs=1;
 			self::scanFile($path);
 		}else{
@@ -68,8 +68,8 @@ class OC_MEDIA_SCANNER{
 	 * @return boolean
 	 */
 	public static function scanFile($path){
-		$file=OC_FILESYSTEM::getLocalFile($path);
-		if(substr($path,-3)=='mp3' and OC_HELPER::canExecute("id3info") and OC_HELPER::canExecute("mp3info")){//use the command line tool id3info if possible
+		$file=OC_Filesystem::getLocalFile($path);
+		if(substr($path,-3)=='mp3' and OC_Helper::canExecute("id3info") and OC_Helper::canExecute("mp3info")){//use the command line tool id3info if possible
 			$output=array();
 			$size=filesize($file);
 			$length=0;
diff --git a/apps/media/settings.php b/apps/media/settings.php
index 30276601a2d..0563bc38fb3 100644
--- a/apps/media/settings.php
+++ b/apps/media/settings.php
@@ -24,20 +24,19 @@
 
 require_once('../../lib/base.php');
 
-if( !OC_USER::isLoggedIn()){
-	header( "Location: ".OC_HELPER::linkTo( "index.php" ));
+if( !OC_User::isLoggedIn()){
+	header( "Location: ".OC_Helper::linkTo( "index.php" ));
 	exit();
 }
 
-require( 'template.php' );
 require( 'lib_collection.php' );
 
-OC_UTIL::addStyle('media','style');
-OC_UTIL::addScript('media','settings');
+OC_Util::addStyle('media','style');
+OC_Util::addScript('media','settings');
 
-OC_APP::setActiveNavigationEntry( 'media_settings' );
+OC_App::setActiveNavigationEntry( 'media_settings' );
 
-$folderNames=explode(PATH_SEPARATOR,OC_PREFERENCES::getValue($_SESSION['user_id'],'media','paths',''));
+$folderNames=explode(PATH_SEPARATOR,OC_Preferences::getValue($_SESSION['user_id'],'media','paths',''));
 $folders=array();
 foreach($folderNames as $folder){
 	if($folder){
@@ -45,9 +44,9 @@ foreach($folderNames as $folder){
 	}
 }
 
-$tmpl = new OC_TEMPLATE( 'media', 'settings', 'admin' );
+$tmpl = new OC_Template( 'media', 'settings', 'admin' );
 $tmpl->assign('folders',$folders);
-$tmpl->assign('autoupdate',OC_PREFERENCES::getValue($_SESSION['user_id'],'media','autoupdate',false));
+$tmpl->assign('autoupdate',OC_Preferences::getValue($_SESSION['user_id'],'media','autoupdate',false));
 $tmpl->printPage();
 ?>
 
diff --git a/apps/media/templates/collection.php b/apps/media/templates/collection.php
new file mode 100644
index 00000000000..e2c256a6480
--- /dev/null
+++ b/apps/media/templates/collection.php
@@ -0,0 +1,10 @@
+<ul id='collection'>
+	<li class='artist'>
+		<img src="<?php echo image_path('files','loading.gif') ?>" alt='loading'/>Loading Collection...
+	</li>
+	<li class='template'>
+		<span></span>
+		<button class='add'>Add</button>
+		<button class='play'>Play</button>
+	</li>
+</ul>
\ No newline at end of file
diff --git a/apps/media/templates/music.php b/apps/media/templates/music.php
index 47ad64fa7c6..7a61d59c9ba 100644
--- a/apps/media/templates/music.php
+++ b/apps/media/templates/music.php
@@ -1,3 +1,3 @@
 <?php echo $_['player'];?>
-<div id='collection'><ul/></div>
-<ul id="playlist"/>
\ No newline at end of file
+<?php echo $_['collection'];?>
+<?php echo $_['playlist'];?>
diff --git a/apps/media/templates/playlist.php b/apps/media/templates/playlist.php
new file mode 100644
index 00000000000..bdc6ef59bb0
--- /dev/null
+++ b/apps/media/templates/playlist.php
@@ -0,0 +1,30 @@
+<table id='playlist'>
+	<thead>
+		<tr>
+			<th class='name'><input id='selectAll' type='checkbox'>Name</th>
+			<th class='artist'>Artist</th>
+			<th class='album'>Album</th>
+			<th class='time'>Time</th>
+			<th class='plays'>Plays</th>
+		</tr>
+	</thead>
+	<tbody>
+		<tr>
+			<td>
+				The playlist is empty
+			</td>
+		</tr>
+	</tbody>
+	<tfoot>
+		<tr class='template'>
+			<td class='name'>
+				<input type='checkbox'>
+				<span></span>
+			</td>
+			<td class='artist'></td>
+			<td class='album'></td>
+			<td class='time'></td>
+			<td class='plays'></td>
+		</tr>
+	</tfoot>
+</table>
\ No newline at end of file
diff --git a/apps/media/tomahawk.php b/apps/media/tomahawk.php
index 873a4e2092c..bf0c2c2a756 100644
--- a/apps/media/tomahawk.php
+++ b/apps/media/tomahawk.php
@@ -28,8 +28,8 @@ require_once('lib_collection.php');
 
 $user=isset($_POST['user'])?$_POST['user']:'';
 $pass=isset($_POST['pass'])?$_POST['pass']:'';
-if(OC_USER::checkPassword($user,$pass)){
-	OC_UTIL::setupFS($user);
+if(OC_User::checkPassword($user,$pass)){
+	OC_Util::setupFS($user);
 	OC_MEDIA_COLLECTION::$uid=$user;
 }else{
 	exit;
@@ -40,14 +40,14 @@ if(isset($_POST['play']) and $_POST['play']=='true'){
 		exit;
 	}
 	$song=OC_MEDIA_COLLECTION::getSong($_POST['song']);
-	$ftype=OC_FILESYSTEM::getMimeType( $song['song_path'] );
+	$ftype=OC_Filesystem::getMimeType( $song['song_path'] );
 	header('Content-Type:'.$ftype);
 	header('Expires: 0');
 	header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
 	header('Pragma: public');
-	header('Content-Length: '.OC_FILESYSTEM::filesize($song['song_path']));
+	header('Content-Length: '.OC_Filesystem::filesize($song['song_path']));
 
-	OC_FILESYSTEM::readfile($song['song_path']);
+	OC_Filesystem::readfile($song['song_path']);
 }
 
 $artist=isset($_POST['artist'])?'%'.$_POST['artist'].'%':'';
@@ -59,7 +59,7 @@ $album=OC_MEDIA_COLLECTION::getAlbumId($album,$artist);
 
 $songs=OC_MEDIA_COLLECTION::getSongs($artist,$album,$song);
 
-$baseUrl=OC_UTIL::getServerURL().OC_HELPER::linkTo('media','tomahawk.php');
+$baseUrl=OC_Util::getServerURL().OC_Helper::linkTo('media','tomahawk.php');
 
 $results=array();
 foreach($songs as $song) {
@@ -68,7 +68,7 @@ foreach($songs as $song) {
 		'album' => OC_MEDIA_COLLECTION::getAlbumName($song['song_album']),
 		'track' => $song['song_name'],
 		'source' => 'ownCloud',
-		'mimetype' => OC_FILESYSTEM::getMimeType($song['song_path']),
+		'mimetype' => OC_Filesystem::getMimeType($song['song_path']),
 		'extension' => substr($song['song_path'],strrpos($song['song_path'],'.')),
 		'url' => $baseUrl.'?play=true&song='.$song['song_id'],
 		'bitrate' => round($song['song_id']/$song['song_length'],0),
diff --git a/apps/user_ldap/appinfo/app.php b/apps/user_ldap/appinfo/app.php
index 67b61989f7f..7f20372ea8d 100644
--- a/apps/user_ldap/appinfo/app.php
+++ b/apps/user_ldap/appinfo/app.php
@@ -27,13 +27,13 @@ require_once('apps/user_ldap/user_ldap.php');
 define("OC_USER_BACKEND_LDAP_DEFAULT_PORT", 389);
 
 // register user backend
-OC_USER::useBackend( "LDAP" );
+OC_User::useBackend( "LDAP" );
 
 // add settings page to navigation
 $entry = array(
 	'id' => "user_ldap_settings",
 	'order'=>1,
-	'href' => OC_HELPER::linkTo( "user_ldap", "settings.php" ),
+	'href' => OC_Helper::linkTo( "user_ldap", "settings.php" ),
 	'name' => 'LDAP'
 );
-OC_APP::addNavigationSubEntry( "core_users", $entry);
+OC_App::addNavigationSubEntry( "core_users", $entry);
diff --git a/apps/user_ldap/settings.php b/apps/user_ldap/settings.php
index f7aff1b4614..cae3542a65b 100644
--- a/apps/user_ldap/settings.php
+++ b/apps/user_ldap/settings.php
@@ -22,10 +22,9 @@
  */
 
 require_once('../../lib/base.php');
-require( 'template.php' );
 
-if( !OC_USER::isLoggedIn() || !OC_GROUP::inGroup( OC_USER::getUser(), 'admin' )){
-	header( "Location: ".OC_HELPER::linkTo( "index.php" ));
+if( !OC_User::isLoggedIn() || !OC_Group::inGroup( OC_User::getUser(), 'admin' )){
+	header( "Location: ".OC_Helper::linkTo( "index.php" ));
 	exit();
 }
 
@@ -33,20 +32,20 @@ $params = array('ldap_host', 'ldap_port', 'ldap_dn', 'ldap_password', 'ldap_base
 
 foreach($params as $param){
 	if(isset($_POST[$param])){
-		OC_APPCONFIG::setValue('user_ldap', $param, $_POST[$param]);
+		OC_Appconfig::setValue('user_ldap', $param, $_POST[$param]);
 	}
 }
-OC_APP::setActiveNavigationEntry( "user_ldap_settings" );
+OC_App::setActiveNavigationEntry( "user_ldap_settings" );
 
 
 // fill template
-$tmpl = new OC_TEMPLATE( 'user_ldap', 'settings', 'admin' );
+$tmpl = new OC_Template( 'user_ldap', 'settings', 'admin' );
 foreach($params as $param){
-		$value = OC_APPCONFIG::getValue('user_ldap', $param,'');
+		$value = OC_Appconfig::getValue('user_ldap', $param,'');
 		$tmpl->assign($param, $value);
 }
 
 // ldap_port has a default value
-$tmpl->assign( 'ldap_port', OC_APPCONFIG::getValue('user_ldap', 'ldap_port', OC_USER_BACKEND_LDAP_DEFAULT_PORT));
+$tmpl->assign( 'ldap_port', OC_Appconfig::getValue('user_ldap', 'ldap_port', OC_USER_BACKEND_LDAP_DEFAULT_PORT));
 
 $tmpl->printPage();
diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php
index a2fd48cdf06..54fc51fe0cd 100644
--- a/apps/user_ldap/user_ldap.php
+++ b/apps/user_ldap/user_ldap.php
@@ -21,9 +21,7 @@
  *
  */
 
-require_once('User/backend.php');
-
-class OC_USER_LDAP extends OC_USER_BACKEND {
+class OC_USER_LDAP extends OC_User_Backend {
 
 	protected $ds;
 	protected $configured = false;
@@ -37,12 +35,12 @@ class OC_USER_LDAP extends OC_USER_BACKEND {
 	protected $ldap_filter;
 
 	function __construct() {
-		$this->ldap_host = OC_APPCONFIG::getValue('user_ldap', 'ldap_host','');
-		$this->ldap_port = OC_APPCONFIG::getValue('user_ldap', 'ldap_port', OC_USER_BACKEND_LDAP_DEFAULT_PORT	);
-		$this->ldap_dn = OC_APPCONFIG::getValue('user_ldap', 'ldap_dn','');
-		$this->ldap_password = OC_APPCONFIG::getValue('user_ldap', 'ldap_password','');
-		$this->ldap_base = OC_APPCONFIG::getValue('user_ldap', 'ldap_base','');
-		$this->ldap_filter = OC_APPCONFIG::getValue('user_ldap', 'ldap_filter','');
+		$this->ldap_host = OC_Appconfig::getValue('user_ldap', 'ldap_host','');
+		$this->ldap_port = OC_Appconfig::getValue('user_ldap', 'ldap_port', OC_USER_BACKEND_LDAP_DEFAULT_PORT	);
+		$this->ldap_dn = OC_Appconfig::getValue('user_ldap', 'ldap_dn','');
+		$this->ldap_password = OC_Appconfig::getValue('user_ldap', 'ldap_password','');
+		$this->ldap_base = OC_Appconfig::getValue('user_ldap', 'ldap_base','');
+		$this->ldap_filter = OC_Appconfig::getValue('user_ldap', 'ldap_filter','');
 
 		if( !empty($this->ldap_host)
 			&& !empty($this->ldap_port)
diff --git a/apps/user_openid/appinfo/app.php b/apps/user_openid/appinfo/app.php
index d6eacfc0a3a..74c13402caf 100644
--- a/apps/user_openid/appinfo/app.php
+++ b/apps/user_openid/appinfo/app.php
@@ -6,15 +6,15 @@ if (!in_array ('curl', get_loaded_extensions())){
 }
 
 $urlBase=((isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') ? 'https' : 'http').'://'.$_SERVER['HTTP_HOST'];
-OC_UTIL::addHeader('link',array('rel'=>'openid.server', 'href'=>$urlBase.OC_HELPER::linkTo( "user_openid", "user.php" ).'/'));
-OC_UTIL::addHeader('link',array('rel'=>'openid.delegate', 'href'=>$urlBase.OC_HELPER::linkTo( "user_openid", "user.php" ).'/'));
+OC_Util::addHeader('link',array('rel'=>'openid.server', 'href'=>$urlBase.OC_Helper::linkTo( "user_openid", "user.php" ).'/'));
+OC_Util::addHeader('link',array('rel'=>'openid.delegate', 'href'=>$urlBase.OC_Helper::linkTo( "user_openid", "user.php" ).'/'));
 
 require_once 'apps/user_openid/user_openid.php';
 
-OC_APP::addSettingsPage( array( "id" => "user_openid_settings", 'order'=>1, "href" => OC_HELPER::linkTo( "user_openid", "settings.php" ), "name" => "OpenID"));
+OC_App::addSettingsPage( array( "id" => "user_openid_settings", 'order'=>1, "href" => OC_Helper::linkTo( "user_openid", "settings.php" ), "name" => "OpenID"));
 
 //active the openid backend
-OC_USER::useBackend('openid');
+OC_User::useBackend('openid');
 
 //check for results from openid requests
 if(isset($_GET['openid_mode']) and $_GET['openid_mode'] == 'id_res'){
diff --git a/apps/user_openid/phpmyid.php b/apps/user_openid/phpmyid.php
index bc2950982fa..bcab9e55cbb 100644
--- a/apps/user_openid/phpmyid.php
+++ b/apps/user_openid/phpmyid.php
@@ -12,9 +12,6 @@
  * @version 0.9
  */
 
-require( 'template.php' );
-
-
 /**
  * Set a constant to indicate that phpMyID is running
  */
@@ -208,7 +205,7 @@ function authorize_mode () {
 
 	$profile['idp_url']=$IDENTITY;
 	if (isset($_SERVER['PHP_AUTH_USER']) && $profile['authorized'] === false && $_SERVER['PHP_AUTH_USER']==$USERNAME) {
-		if (OC_USER::checkPassword($USERNAME, $_SERVER['PHP_AUTH_PW'])) {// successful login!
+		if (OC_User::checkPassword($USERNAME, $_SERVER['PHP_AUTH_PW'])) {// successful login!
 			// return to the refresh url if they get in
 			$_SESSION['openid_auth']=true;
 			$_SESSION['openid_user']=$USERNAME;
@@ -562,7 +559,7 @@ function logout_mode () {
  */
 function no_mode () {
 	global $USERNAME, $profile;
-	$tmpl = new OC_TEMPLATE( 'user_openid', 'nomode', 'guest' );
+	$tmpl = new OC_Template( 'user_openid', 'nomode', 'guest' );
 	if(substr($profile['req_url'],-1,1)!=='/'){//the identity should always end with a /
 		$profile['req_url'].='/';
 	}
diff --git a/apps/user_openid/settings.php b/apps/user_openid/settings.php
index 76316de100c..4293a6c8aaf 100644
--- a/apps/user_openid/settings.php
+++ b/apps/user_openid/settings.php
@@ -1,23 +1,22 @@
 <?php
 
 require_once('../../lib/base.php');
-require( 'template.php' );
-if( !OC_USER::isLoggedIn()){
-    header( "Location: ".OC_HELPER::linkTo( "index.php" ));
+if( !OC_User::isLoggedIn()){
+    header( "Location: ".OC_Helper::linkTo( "index.php" ));
     exit();
 }
 
 if(isset($_POST['input_identity'])){
-	OC_PREFERENCES::setValue(OC_USER::getUser(),'user_openid','identity',$_POST['input_identity']);
+	OC_Preferences::setValue(OC_User::getUser(),'user_openid','identity',$_POST['input_identity']);
 }
 
-OC_APP::setActiveNavigationEntry( "user_openid_settings" );
+OC_App::setActiveNavigationEntry( "user_openid_settings" );
 
-$identity=OC_PREFERENCES::getValue(OC_USER::getUser(),'user_openid','identity','');
+$identity=OC_Preferences::getValue(OC_User::getUser(),'user_openid','identity','');
 
-$tmpl = new OC_TEMPLATE( "user_openid", "settings", "admin");
+$tmpl = new OC_Template( "user_openid", "settings", "admin");
 $tmpl->assign('identity',$identity);
-$tmpl->assign('user',OC_USER::getUser());
+$tmpl->assign('user',OC_User::getUser());
 
 $tmpl->printPage();
 
diff --git a/apps/user_openid/user.php b/apps/user_openid/user.php
index 4b5d13e3398..3743d232b6d 100644
--- a/apps/user_openid/user.php
+++ b/apps/user_openid/user.php
@@ -38,7 +38,7 @@ $RUNTIME_NOAPPS=true;
 $RUNTIME_NOAPPS=false;
 require_once '../../lib/base.php';
 
-if(!OC_USER::userExists($USERNAME)){
+if(!OC_User::userExists($USERNAME)){
 	error_log($USERNAME.' doesn\'t exist');
 	$USERNAME='';
 }
diff --git a/apps/user_openid/user_openid.php b/apps/user_openid/user_openid.php
index ddf5cc9bc23..d9af94dcafa 100644
--- a/apps/user_openid/user_openid.php
+++ b/apps/user_openid/user_openid.php
@@ -21,13 +21,12 @@
  *
  */
 
-require_once('User/backend.php');
 require_once('class.openid.v3.php');
 
 /**
  * Class for user management in a SQL Database (e.g. MySQL, SQLite)
  */
-class OC_USER_OPENID extends OC_USER_BACKEND {
+class OC_USER_OPENID extends OC_User_Backend {
 	/**
 	 * @brief Check if the password is correct
 	 * @param $uid The username
diff --git a/core/css/styles.css b/core/css/styles.css
index 00433979d24..eb6b04d28df 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -23,6 +23,7 @@ form input[type="submit"]:active { outline:0; }
 form input[type="button"], form input[type="text"] { font-size:0.9em; }
 fieldset { padding:1em; background-color:#f7f7f7; border:1px solid #ddd; max-width:600px; margin:2em 2em 2em 3em; }
 legend { padding:0.5em; font-size:1.2em; }
+.template{display:none;}
 
 div.controls { width:100%; margin:0px; background-color:#f7f7f7; border-bottom:1px solid #eee; position:fixed; z-index:2; }
 
@@ -31,7 +32,7 @@ div.controls { width:100%; margin:0px; background-color:#f7f7f7; border-bottom:1
 #body-login p.info { width:16em; margin:2em auto; padding:1em; background-color:#eee; border:1px solid #ccc; -moz-border-radius:10px; -webkit-border-radius:10px; border-radius:10px; }
 #body-login p.info a { font-weight:bold; }
 
-#login div.header { margin-top:-2em; height:10em;
+#body-login header { margin-top:-2em; height:10em;
  -moz-box-shadow:0 0 5px #000; -webkit-box-shadow:0 0 20px #000; box-shadow:0 0 20px #000;
 background: #1d2d44; /* Old browsers */
 background: -moz-linear-gradient(top, #35537a 0%, #1d2d42 100%); /* FF3.6+ */
@@ -87,9 +88,9 @@ input[type="search"] { font-size:1em; padding-left:2em; background:#eee url('../
 #plugins a { display:block; padding:0.5em 0.5em 0.5em 3em; background-position:1.5em center; background-repeat:no-repeat; border-bottom:1px solid #ddd; border-top:1px solid #fff; text-decoration:none; font-size:1.2em; color:#666; }
 #plugins a.active, #plugins a:hover, #plugins a:focus, #plugins a.selected { background-color:#ccc; border-top:1px solid #ccc; border-bottom:1px solid #ccc; color:#000; outline:0; }
 #plugins a:active { outline:0; }
-#plugins .subentry { background-color:#ddd; border-top:1px solid #aaa; border-bottom:1px solid #ccc; color:#000; outline:0; }
-#plugins .subentry.active { background-color:#bbb; border-top:1px solid #aaa; border-bottom:1px solid #ccc; color:#000; outline:0; }
-#plugins li.subentry a {padding-left:4em;}
+#plugins .subentry { background-color:#ddd; border-top:1px solid #aaa; color:#000; outline:0; }
+#plugins .subentry.active { background-color:#bbb; border-top:1px solid #aaa; color:#000; outline:0; }
+#plugins li.subentry a { padding-left:3.7em; font-size:1em; }
 
 /* CONTENT ------------------------------------------------------------------ */
 #content { margin:3.5em 0 0 15.7em; }
diff --git a/core/js/js.js b/core/js/js.js
index db96a1adb3e..f85331db60a 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -47,18 +47,38 @@ OC={
 	},
 	addScript:function(app,script,ready){
 		var path=OC.filePath(app,'js',script+'.js');
-		if(ready){
-			$.getScript(path,ready);
+		if(OC.addStyle.loaded.indexOf(path)==-1){
+			OC.addStyle.loaded.push(path);
+			if(ready){
+				$.getScript(path,ready);
+			}else{
+				$.getScript(path);
+			}
 		}else{
-			$.getScript(path);
+			if(ready){
+				ready();
+			}
 		}
 	},
 	addStyle:function(app,style){
 		var path=OC.filePath(app,'css',style+'.css');
-		var style=$('<link rel="stylesheet" type="text/css" href="'+path+'"/>');
-		$('head').append(style);
+		if(OC.addScript.loaded.indexOf(path)==-1){
+			OC.addScript.loaded.push(path);
+			var style=$('<link rel="stylesheet" type="text/css" href="'+path+'"/>');
+			$('head').append(style);
+		}
+	},
+	search:function(query){
+		if(query){
+			OC.addScript('search','result',function(){
+				OC.addStyle('search','results');
+				$.getJSON(OC.filePath('search','ajax','search.php')+'?query='+encodeURIComponent(query), OC.search.showResults);
+			});
+		}
 	}
 }
+OC.addStyle.loaded=[];
+OC.addScript.loaded=[];
 
 if (!Array.prototype.filter) {
 	Array.prototype.filter = function(fun /*, thisp*/) {
@@ -112,4 +132,15 @@ $(document).ready(function(){
 			element.attr('src',src.substr(0,src.length-3)+'png');
 		});
 	};
+	$('#searchbox').keyup(function(){
+		var query=$('#searchbox').val();
+		if(query.length>2){
+			OC.search(query);
+		}else{
+			if(OC.search.hide){
+				OC.search.hide();
+			}
+		}
+	});
+	$('#searchbox').click(function(){$('#searchbox').trigger('keyup')});
 });
diff --git a/core/l10n/bg_BG.php b/core/l10n/bg_BG.php
new file mode 100644
index 00000000000..bd9886fcd90
--- /dev/null
+++ b/core/l10n/bg_BG.php
@@ -0,0 +1,17 @@
+<?php $TRANSLATIONS = array(
+"Error 404, Cloud not found" => "Грешка 404, обклакът не намерен",
+"Advanced" => "Разширено",
+"Set where to store the data." => "Изберете къде да записва данните",
+"Data directory:" => "Директория за данни:",
+"SQLite" => "SQLite",
+"Database name:" => "Име на базата:",
+"Host:" => "хост:",
+"Table prefix:" => "Префикс за таблиците:",
+"Finish setup" => "Завършване на настройките",
+"<a href=\"http://owncloud.org/\">ownCloud</a> is a personal cloud which runs on your own server.</p>" => "<a href=\"http://owncloud.org/\">ownCloud</a> е персонален облак който работи от Ваш собствен сървър.</p>",
+"Login failed!" => "Входа пропадна!",
+"You are logged out." => "Вие излязохте.",
+"prev" => "пред.",
+"next" => "следващо",
+"Search" => "Търсене"
+);
diff --git a/core/l10n/da.php b/core/l10n/da.php
index 631201bab60..20d769f3856 100644
--- a/core/l10n/da.php
+++ b/core/l10n/da.php
@@ -1,22 +1,12 @@
 <?php $TRANSLATIONS = array(
 "Error 404, Cloud not found" => "Fejl 404, Skyen kan ikke findes",
-"Welcome to <strong>ownCloud</strong>, your personnal cloud." => "Velkommen til <strong>ownCloud</strong>, din personlige Sky.",
-"To finish the installation, please follow the steps below." => "For at fuldføre installationen, følg venligst nedenstående trin",
-"Create an <strong>admin account.</strong>" => "Lav en <strong>administrator konto.</strong>",
-"Login:" => "Login:",
-"Password:" => "Kodeord:",
 "Advanced" => "Avanceret",
 "Set where to store the data." => "Indstil data mappe.",
 "Data directory:" => "Data mappe:",
-"Configure your database." => "Konfigurer din database.",
-"I will use a SQLite database. You have nothing to do!" => "Jeg vil benytte en SQLite database. Du skal ikke gøre noget!",
 "SQLite" => "SQLite",
-"I will use a MySQL database." => "Jeg vil benytte en MySQL database.",
-"Host:" => "Host:",
 "Database name:" => "Database navn:",
+"Host:" => "Host:",
 "Table prefix:" => "Tabel prefix:",
-"MySQL user login:" => "MySQL bruger login:",
-"MySQL user password:" => "MySQL bruger password:",
 "Finish setup" => "Afslut installation",
 "<a href=\"http://owncloud.org/\">ownCloud</a> is a personal cloud which runs on your own server.</p>" => "<a href=\"http://owncloud.org/\">ownCloud</a> er din personly sky der køre på din egen server.</p>",
 "Login failed!" => "Login mislykkedes",
diff --git a/core/l10n/de.php b/core/l10n/de.php
index b1309beed06..9b5225dd0fa 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -1,27 +1,28 @@
 <?php $TRANSLATIONS = array(
 "Error 404, Cloud not found" => "Cloud konnte nicht gefunden werden.",
-"Welcome to <strong>ownCloud</strong>, your personnal cloud." => "Willkommen bei <strong>ownCloud</strong>, deinem persönlichen Online-Speicher.",
-"To finish the installation, please follow the steps below." => "Die Installation ist fast abgeschlossen.",
-"Create an <strong>admin account.</strong>" => "<strong>Verwaltungskonto</strong> erstellen.",
-"Login:" => "Benutzername:",
-"Password:" => "Passwort:",
+"<strong>ownCloud</strong> is your personal web storage." => "<strong>ownCloud</strong> ist dein persönlicher Online-Speicher.",
+"Finish the setup by following the steps below." => "Die Installation ist fast abgeschlossen.",
+"Create an <strong>admin account</strong>." => "<strong>Verwalter-Konto</strong> erstellen",
+"Username" => "Nutzername",
+"Password" => "Passwort",
 "Advanced" => "Erweitert",
 "Set where to store the data." => "Speicherort der Daten",
 "Data directory:" => "Datenverzeichnis:",
-"Configure your database." => "Datenbank einstellen.",
-"I will use a SQLite database. You have nothing to do!" => "Es wird eine SQLite-Datenbank genutzt.",
+"Configure the database." => "Datenbank einrichten",
+"SQLite will be used for the database. You have nothing to do." => "SQLite wird als Datenbank genutzt.",
 "SQLite" => "SQLite",
-"I will use a MySQL database." => "Es wird eine MySQL-Datenbank genutzt.",
-"Host:" => "Host:",
+"MySQL will be used for the database." => "MySQL wird als Datenbank genutzt.",
+"MySQL username:" => "MySQL-Nutzername:",
+"MySQL password:" => "MySQL-Passwort:",
 "Database name:" => "Datenbankname:",
+"Host:" => "Host:",
 "Table prefix:" => "Tabellenpräfix:",
-"MySQL user login:" => "MySQL-Nutzername:",
-"MySQL user password:" => "MySQL-Passwort:",
+"Finish setup" => "Installation abschließen",
 "<a href=\"http://owncloud.org/\">ownCloud</a> is a personal cloud which runs on your own server.</p>" => "<a href=\"http://owncloud.org/\">ownCloud</a> ist ein privater Online-Speicher für deinen eigenen Server.</p>",
-"Login failed!" => "Anmeldung Fehlgeschlagen!",
-"You are logged out." => "Sie wurden abgemeldet.",
-"prev" => "zurück",
-"next" => "weiter",
-"Search" => "Suchen",
-"Finish setup" => "Installation abschließen"
+"Login failed!" => "Anmeldung fehlgeschlagen!",
+"Remember login" => "Anmeldung merken",
+"You are logged out." => "Erfolgreich abgemeldet.",
+"prev" => "Zurück",
+"next" => "Weiter",
+"Search" => "Suchen"
 );
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
new file mode 100644
index 00000000000..540eaef9ca9
--- /dev/null
+++ b/core/l10n/fr.php
@@ -0,0 +1,28 @@
+<?php $TRANSLATIONS = array(
+"Error 404, Cloud not found" => "Erreur 404, la page demandée n'existe pas",
+"<strong>ownCloud</strong> is your personal web storage." => "<strong>ownCloud</strong> est votre espace de stockage web personnel.",
+"Finish the setup by following the steps below." => "Terminez l'installation en suivant les étapes ci-dessous.",
+"Create an <strong>admin account</strong>." => "Veuillez créer un <strong>compte administrateur.</strong>",
+"Username" => "Nom d'utilisateur",
+"Password" => "Mot de passe",
+"Advanced" => "Avancé",
+"Set where to store the data." => "Sélectionnez où sauvegarder les données",
+"Data directory:" => "Répertoire de données",
+"Configure the database." => "Configurez la base de données.",
+"SQLite will be used for the database. You have nothing to do." => "SQLite sera utilisé comme moteur pour la base de données. Vous n'avez rien de plus à faire.",
+"SQLite" => "SQLite",
+"MySQL will be used for the database." => "MySQL sera utilisé comme moteur pour la base de données.",
+"MySQL username:" => "Nom d'utilisateur MySQL :",
+"MySQL password:" => "Mot de passe MySQL :",
+"Database name:" => "Nom de la base de données :",
+"Host:" => "Hôte :",
+"Table prefix:" => "Préfixe de table :",
+"Finish setup" => "Terminer l'installation",
+"<a href=\"http://owncloud.org/\">ownCloud</a> is a personal cloud which runs on your own server.</p>" => "<a href=\"http://owncloud.org/\">ownCloud</a> est votre solution cloud personnelle qui tourne sur votre propre serveur.</p>",
+"Login failed!" => "Échec de la connexion !",
+"Remember login" => "Se souvenir de moi",
+"You are logged out." => "Vous êtes désormais déconnecté.",
+"prev" => "précédent",
+"next" => "suivant",
+"Search" => "Rechercher"
+);
diff --git a/core/l10n/nl.php b/core/l10n/nl.php
index 66d96505971..033adc0e432 100644
--- a/core/l10n/nl.php
+++ b/core/l10n/nl.php
@@ -1,22 +1,12 @@
 <?php $TRANSLATIONS = array(
 "Error 404, Cloud not found" => "Fout 404, Cloud niet gevonden.",
-"Welcome to <strong>ownCloud</strong>, your personnal cloud." => "Welkom by <strong>ownCloud</strong>, uw persoonlijke cloud",
-"To finish the installation, please follow the steps below." => "Volg de volgende stappen om de installatie te voltooien.",
-"Create an <strong>admin account.</strong>" => "Maak een <strong>beheerdersaccount</strong> aan",
-"Login:" => "Gebruikersnaam:",
-"Password:" => "Wachtwoord:",
 "Advanced" => "Geavanceerd",
 "Set where to store the data." => "Bepaal de opslaglocatie.",
 "Data directory:" => "Gegevensmap:",
-"Configure your database." => "Configureer uw database.",
-"I will use a SQLite database. You have nothing to do!" => "Er zal een SQLite database gebruikt worden. U hoeft geen verdere instellingen te maken.",
 "SQLite" => "SQLite",
-"I will use a MySQL database." => "Er zal een MySQL database gebruikt worden.",
-"Host:" => "Host:",
 "Database name:" => "Databasenaam:",
+"Host:" => "Host:",
 "Table prefix:" => "Voorvoegsel voor tabelnamen:",
-"MySQL user login:" => "MySQL gebruikersnaam.",
-"MySQL user password:" => "MySQL wachtwoord",
 "Finish setup" => "Installatie afronden",
 "<a href=\"http://owncloud.org/\">ownCloud</a> is a personal cloud which runs on your own server.</p>" => "<a href=\"http://owncloud.org/\">ownCloud</a> is een persoonlijke cloud die op uw eigen server draait.</p>",
 "Login failed!" => "Aanmelden mislukt.",
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index 6914e11557a..3e4993d4827 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -1,22 +1,12 @@
 <?php $TRANSLATIONS = array(
 "Error 404, Cloud not found" => "Błąd 404, Chmura nie znaleziona",
-"Welcome to <strong>ownCloud</strong>, your personnal cloud." => "Witaj w <strong>ownCloud</strong>, Twojej osobistej chmurze.",
-"To finish the installation, please follow the steps below." => "By zakończyć instalację, podążaj poniższymi krokami.",
-"Create an <strong>admin account.</strong>" => "Utwórz <strong>konto administratora</strong>.",
-"Login:" => "Login:",
-"Password:" => "Hasło:",
 "Advanced" => "Zaawansowane",
 "Set where to store the data." => "Ustaw, gdzie przechowywać dane.",
 "Data directory:" => "Katalog danych:",
-"Configure your database." => "Skonfiguruj Twoją bazę danych.",
-"I will use a SQLite database. You have nothing to do!" => "Użyję bazy SQLite. Nie masz tu nic do roboty!",
 "SQLite" => "SQLite",
-"I will use a MySQL database." => "Użyję bazy danych MySQL.",
-"Host:" => "Host:",
 "Database name:" => "Nazwa bazy:",
+"Host:" => "Host:",
 "Table prefix:" => "Przedrostek tabeli:",
-"MySQL user login:" => "Login użytkownika MySQL:",
-"MySQL user password:" => "Hasło użytkownika MySQL:",
 "Finish setup" => "Zakończ instalację",
 "<a href=\"http://owncloud.org/\">ownCloud</a> is a personal cloud which runs on your own server.</p>" => "<a href=\"http://owncloud.org/\">ownCloud</a> jest osobistą chmurą działającą na Twoim własnym serwerze.</p>",
 "Login failed!" => "Nie udało się zalogować!",
diff --git a/core/templates/404.php b/core/templates/404.php
index b78828e6301..67ce8c8026c 100644
--- a/core/templates/404.php
+++ b/core/templates/404.php
@@ -1,19 +1,18 @@
 <?php
 if(!isset($_)){//also provide standalone error page
 	require_once '../../lib/base.php';
-	require( 'template.php' );
 	
-	$tmpl = new OC_TEMPLATE( '', '404', 'guest' );
+	$tmpl = new OC_Template( '', '404', 'guest' );
 	$tmpl->printPage();
 	exit;
 }
 ?>
 <div id="login">
-	<img src="<?php echo image_path("", "weather-clear.png"); ?>" alt="ownCloud" />
+	<header><img src="<?php echo image_path('', 'weather-clear.png'); ?>" alt="ownCloud" /></header>
 	<ul>
 		<li class='error'>
 			<?php echo $l->t( 'Error 404, Cloud not found' ); ?><br/>
 			<p class='hint'><?php if(isset($_['file'])) echo $_['file']?></p>
 		</li>
 	</ul>
-</div>
\ No newline at end of file
+</div>
diff --git a/core/templates/error.php b/core/templates/error.php
index ae3f029708f..aa8a8d473b4 100644
--- a/core/templates/error.php
+++ b/core/templates/error.php
@@ -1,10 +1,5 @@
-<?php
-/*
- * Template for error page
- */
-?>
 <div id="login">
-	<img src="<?php echo image_path("", "owncloud-logo-medium-white.png"); ?>" alt="ownCloud" />
+	<header><img src="<?php echo image_path('', 'owncloud-logo-medium-white.png'); ?>" alt="ownCloud" /></header>
 	<ul>
 		<?php foreach($_["errors"] as $error):?>
 			<li class='error'>
diff --git a/core/templates/installation.php b/core/templates/installation.php
index 0a6dacad955..8b36d14bbf5 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -24,15 +24,15 @@
 
 		<fieldset>
 			<legend><?php echo $l->t( 'Create an <strong>admin account</strong>.' ); ?></legend>
-			<p><label for="adminlogin"><?php echo $l->t( 'Username' ); ?></label><input type="text" name="adminlogin" id="adminlogin" value="<?php print OC_HELPER::init_var('adminlogin'); ?>" autofocus /></p>
-			<p><label for="adminpass"><?php echo $l->t( 'Password' ); ?></label><input type="password" name="adminpass" id="adminpass" value="<?php print OC_HELPER::init_var('adminpass'); ?>" /></p>
+			<p><label for="adminlogin"><?php echo $l->t( 'Username' ); ?></label><input type="text" name="adminlogin" id="adminlogin" value="<?php print OC_Helper::init_var('adminlogin'); ?>" autofocus /></p>
+			<p><label for="adminpass"><?php echo $l->t( 'Password' ); ?></label><input type="password" name="adminpass" id="adminpass" value="<?php print OC_Helper::init_var('adminpass'); ?>" /></p>
         </fieldset>
         
-        <a id='showAdvanced'><strong><?php echo $l->t( 'Advanced' ); ?></strong> <img src='<?php echo OC_HELPER::imagePath('','drop-arrow.png'); ?>'></img></a>
+        <a id='showAdvanced'><strong><?php echo $l->t( 'Advanced' ); ?></strong> <img src='<?php echo OC_Helper::imagePath('','drop-arrow.png'); ?>'></img></a>
         
         <fieldset id='datadirField'>
 			<legend><?php echo $l->t( 'Set where to store the data.' ); ?></legend>
-			<p><label for="directory"><?php echo $l->t( 'Data directory:' ); ?></label><input type="text" name="directory" id="directory" value="<?php print OC_HELPER::init_var('directory', $_['directory']); ?>" /></p>
+			<p><label for="directory"><?php echo $l->t( 'Data directory:' ); ?></label><input type="text" name="directory" id="directory" value="<?php print OC_Helper::init_var('directory', $_['directory']); ?>" /></p>
 		</fieldset>
 		
 		<fieldset id='databaseField'>
@@ -43,7 +43,7 @@
 			<p><?php echo $l->t( 'SQLite will be used for the database. You have nothing to do.' ); ?></p>
 			<input type="hidden" id="dbtype" name="dbtype" value="sqlite" />
 			<?php else: ?>
-			<p><label class="sqlite" for="sqlite"><?php echo $l->t( 'SQLite' ); ?></label><input type="radio" name="dbtype" value='sqlite' id="sqlite" <?php OC_HELPER::init_radio('dbtype', 'sqlite', 'sqlite'); ?>/></p>
+			<p><label class="sqlite" for="sqlite"><?php echo $l->t( 'SQLite' ); ?></label><input type="radio" name="dbtype" value='sqlite' id="sqlite" <?php OC_Helper::init_radio('dbtype', 'sqlite', 'sqlite'); ?>/></p>
 			<?php endif; ?>
 			<?php endif; ?>
 
@@ -53,14 +53,14 @@
 			<p><?php echo $l->t( 'MySQL will be used for the database.' ); ?></p>
 			<input type="hidden" id="dbtype" name="dbtype" value="mysql" />
 			<?php else: ?>
-			<p><label class="mysql" for="mysql">MySQL </label><input type="radio" name="dbtype" value='mysql' id="mysql" <?php OC_HELPER::init_radio('dbtype', 'mysql', 'sqlite'); ?>/></p>
+			<p><label class="mysql" for="mysql">MySQL </label><input type="radio" name="dbtype" value='mysql' id="mysql" <?php OC_Helper::init_radio('dbtype', 'mysql', 'sqlite'); ?>/></p>
 			<?php endif; ?>
 			<div id="use_mysql">
-				<p><label for="dbuser"><?php echo $l->t( 'MySQL username:' ); ?></label><input type="text" name="dbuser" id="dbuser" value="<?php print OC_HELPER::init_var('dbuser'); ?>" /></p>
-				<p><label for="dbpass"><?php echo $l->t( 'MySQL password:' ); ?></label><input type="password" name="dbpass" id="dbpass" value="<?php print OC_HELPER::init_var('dbpass'); ?>" /></p>
-				<p><label for="dbname"><?php echo $l->t( 'Database name:' ); ?></label><input type="text" name="dbname" id="dbname" value="<?php print OC_HELPER::init_var('dbname'); ?>" /></p>
-				<p><label for="dbhost"><?php echo $l->t( 'Host:' ); ?></label><input type="text" name="dbhost" id="dbhost" value="<?php print OC_HELPER::init_var('dbhost', 'localhost'); ?>" /></p>
-				<p><label for="dbtableprefix"><?php echo $l->t( 'Table prefix:' ); ?></label><input type="text" name="dbtableprefix" id="dbtableprefix" value="<?php print OC_HELPER::init_var('dbtableprefix', 'oc_'); ?>" /></p>
+				<p><label for="dbuser"><?php echo $l->t( 'MySQL username:' ); ?></label><input type="text" name="dbuser" id="dbuser" value="<?php print OC_Helper::init_var('dbuser'); ?>" /></p>
+				<p><label for="dbpass"><?php echo $l->t( 'MySQL password:' ); ?></label><input type="password" name="dbpass" id="dbpass" value="<?php print OC_Helper::init_var('dbpass'); ?>" /></p>
+				<p><label for="dbname"><?php echo $l->t( 'Database name:' ); ?></label><input type="text" name="dbname" id="dbname" value="<?php print OC_Helper::init_var('dbname'); ?>" /></p>
+				<p><label for="dbhost"><?php echo $l->t( 'Host:' ); ?></label><input type="text" name="dbhost" id="dbhost" value="<?php print OC_Helper::init_var('dbhost', 'localhost'); ?>" /></p>
+				<p><label for="dbtableprefix"><?php echo $l->t( 'Table prefix:' ); ?></label><input type="text" name="dbtableprefix" id="dbtableprefix" value="<?php print OC_Helper::init_var('dbtableprefix', 'oc_'); ?>" /></p>
 				
 			</div>
 			<?php endif; ?>
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 8f073914a1f..1de0ccf80c1 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -47,7 +47,7 @@
 							<?php if( sizeof( $entry["subnavigation"] )): ?>
 								<ul>
 									<?php foreach($entry["subnavigation"] as $subentry):?>
-										<li class="subentry"><a style="background-image:url(<?php echo $subentry['icon']; ?>)" href="<?php echo $subentry['href']; ?>" title="" <?php if( $subentry['active'] ): ?>class="active"<?php endif; ?>><?php echo $subentry['name'] ?></a></li>
+										<li class="subentry"><a style="background-image:url(<?php echo $subentry['icon']; ?>)" href="<?php echo $subentry['href']; ?>" title="" class="subentry<?php if( $subentry['active'] ): ?> active<?php endif; ?>"><?php echo $subentry['name'] ?></a></li>
 									<?php endforeach; ?>
 								</ul>
 							<?php endif; ?>
diff --git a/core/templates/part.searchbox.php b/core/templates/part.searchbox.php
index efce47ecd24..ddf184ed5b6 100644
--- a/core/templates/part.searchbox.php
+++ b/core/templates/part.searchbox.php
@@ -1,3 +1,3 @@
 <form class="searchbox" action="<?php echo $_['searchurl']?>" method="post">
-	<input type="search" name="query" value="<?php if(isset($_POST['query'])){echo $_POST['query'];};?>" class="prettybutton" />
+	<input id='searchbox' type="search" name="query" value="<?php if(isset($_POST['query'])){echo $_POST['query'];};?>" class="prettybutton" />
 </form>
diff --git a/docs/skeleton/admin.php b/docs/skeleton/admin.php
index aaf6136692d..20df8a0c71d 100644
--- a/docs/skeleton/admin.php
+++ b/docs/skeleton/admin.php
@@ -29,15 +29,12 @@ $RUNTIME_NOSETUPFS = true;
 require_once('../lib/base.php');
 
 // We need the file system although we said do not load it! Do it by hand now
-OC_UTIL::setupFS();
-
-// We load OC_TEMPLATE, too. This one is not loaded by base
-require( 'template.php' );
+OC_Util::setupFS();
 
 // The user should have admin rights. This is an admin page!
-if( !OC_USER::isLoggedIn() || !OC_USER::ingroup( $_SESSION['username'], 'admin' )){
+if( !OC_User::isLoggedIn() || !OC_User::ingroup( $_SESSION['username'], 'admin' )){
 	// Bad boy! Go to the very first page of owncloud
-	header( "Location: ".OC_HELPER::linkTo( "index.php" ));
+	header( "Location: ".OC_Helper::linkTo( "index.php" ));
 	exit();
 }
 
@@ -46,7 +43,7 @@ $myvar = 2;
 $myarray = array( "foo" => array( 0, 1, 2 ), "bar" => "baz" );
 
 // Preparing for output!
-$tmpl = new OC_TEMPLATE( "skeleton", "admin", "admin" ); // Programname, template, mode
+$tmpl = new OC_Template( "skeleton", "admin", "admin" ); // Programname, template, mode
 // Assign the vars
 $tmpl->assign( "var", $myvar );
 $tmpl->assign( "array", $myarray );
diff --git a/docs/skeleton/appinfo/app.sample.php b/docs/skeleton/appinfo/app.sample.php
index 12db7154c2b..ce310996b05 100644
--- a/docs/skeleton/appinfo/app.sample.php
+++ b/docs/skeleton/appinfo/app.sample.php
@@ -4,12 +4,12 @@
  */
 
 // Hello, we are here
-OC_APP::register( array( "id" => "skeleton", "name" => "Files", "order" => 1000 ));
+OC_App::register( array( "id" => "skeleton", "name" => "Files", "order" => 1000 ));
 
 // Add application to navigation
-OC_UTIL::addNavigationEntry( array( "id" => "skeleton_index", "order" => 1000, "href" => OC_HELPER::linkTo( "skeleton", "index.php" ), "icon" => OC_HELPER::imagePath( "skeleton", "app.png" ), "name" => "Example app" ));
+OC_Util::addNavigationEntry( array( "id" => "skeleton_index", "order" => 1000, "href" => OC_Helper::linkTo( "skeleton", "index.php" ), "icon" => OC_Helper::imagePath( "skeleton", "app.png" ), "name" => "Example app" ));
 
 // Add an admin page
-OC_UTIL::addAdminPage( array( "order" => 1, "href" => OC_HELPER::linkTo( "skeleton", "admin.php" ), "name" => "Example app options" ));
+OC_Util::addAdminPage( array( "order" => 1, "href" => OC_Helper::linkTo( "skeleton", "admin.php" ), "name" => "Example app options" ));
 
 ?>
diff --git a/docs/skeleton/index.php b/docs/skeleton/index.php
index 6d237ed6152..10043887845 100644
--- a/docs/skeleton/index.php
+++ b/docs/skeleton/index.php
@@ -24,23 +24,22 @@
 
 // Init owncloud
 require_once('../lib/base.php');
-require( 'template.php' );
 
 // Check if we are a user
-if( !OC_USER::isLoggedIn()){
-	header( "Location: ".OC_HELPER::linkTo( "index.php" ));
+if( !OC_User::isLoggedIn()){
+	header( "Location: ".OC_Helper::linkTo( "index.php" ));
 	exit();
 }
 
 // Load the files we need
-OC_UTIL::addStyle( "files", "files" );
-OC_UTIL::addScript( "files", "files" );
+OC_Util::addStyle( "files", "files" );
+OC_Util::addScript( "files", "files" );
 
 // Load the files
 $dir = isset( $_GET['dir'] ) ? $_GET['dir'] : '';
 
 $files = array();
-foreach( OC_FILES::getdirectorycontent( $dir ) as $i ){
+foreach( OC_Files::getdirectorycontent( $dir ) as $i ){
 	$i["date"] = date( $CONFIG_DATEFORMAT, $i["mtime"] );
 	$files[] = $i;
 }
@@ -56,7 +55,7 @@ foreach( explode( "/", $dir ) as $i ){
 }
 
 // return template
-$tmpl = new OC_TEMPLATE( "files", "index", "user" );
+$tmpl = new OC_Template( "files", "index", "user" );
 $tmpl->assign( "files", $files );
 $tmpl->assign( "breadcrumb", $breadcrumb );
 $tmpl->printPage();
diff --git a/files/admin.php b/files/admin.php
index 5c9923aff86..0b8639f38ca 100644
--- a/files/admin.php
+++ b/files/admin.php
@@ -24,26 +24,25 @@
 
 // Init owncloud
 require_once('../lib/base.php');
-require( 'template.php' );
 
 
 // Check if we are a user
-if( !OC_USER::isLoggedIn() || !OC_GROUP::inGroup( OC_USER::getUser(), 'admin' )){
-	header( "Location: ".OC_HELPER::linkTo( "index.php" ));
+if( !OC_User::isLoggedIn() || !OC_Group::inGroup( OC_User::getUser(), 'admin' )){
+	header( "Location: ".OC_Helper::linkTo( "index.php" ));
 	exit();
 }
 
 $htaccessWorking=(getenv('htaccessWorking')=='true');
 if(isset($_POST['maxUploadSize'])){
 	$maxUploadFilesize=$_POST['maxUploadSize'];
-	OC_FILES::setUploadLimit(OC_HELPER::computerFileSize($maxUploadFilesize));
+	OC_Files::setUploadLimit(OC_Helper::computerFileSize($maxUploadFilesize));
 }else{
 	$maxUploadFilesize = ini_get('upload_max_filesize').'B';
 }
 
-OC_APP::setActiveNavigationEntry( "files_administration" );
+OC_App::setActiveNavigationEntry( "files_administration" );
 // return template
-$tmpl = new OC_TEMPLATE( "files", "admin", "admin" );
+$tmpl = new OC_Template( "files", "admin", "admin" );
 $tmpl->assign( 'htaccessWorking', $htaccessWorking );
 $tmpl->assign( 'uploadMaxFilesize', $maxUploadFilesize);
 $tmpl->printPage();
diff --git a/files/ajax/autocomplete.php b/files/ajax/autocomplete.php
index 2c2f665fd6c..183ee86c788 100644
--- a/files/ajax/autocomplete.php
+++ b/files/ajax/autocomplete.php
@@ -9,7 +9,7 @@ require_once('../../lib/base.php');
 // header( "Content-Type: application/jsonrequest" );
 
 // Check if we are a user
-if( !OC_USER::isLoggedIn()){
+if( !OC_User::isLoggedIn()){
 	echo json_encode( array( "status" => "error", "data" => array( "message" => "Authentication error" )));
 	exit();
 }
@@ -40,8 +40,8 @@ $query=strtolower($query);
 
 $files=array();
 
-if(OC_FILESYSTEM::file_exists($base) and OC_FILESYSTEM::is_dir($base)){
-	$dh = OC_FILESYSTEM::opendir($base);
+if(OC_Filesystem::file_exists($base) and OC_Filesystem::is_dir($base)){
+	$dh = OC_Filesystem::opendir($base);
 	if($dh){
 		if(substr($base,-1,1)!='/'){
 			$base=$base.'/';
@@ -50,7 +50,7 @@ if(OC_FILESYSTEM::file_exists($base) and OC_FILESYSTEM::is_dir($base)){
 			if ($file != "." && $file != ".."){
 				if(substr(strtolower($file),0,$queryLen)==$query){
 					$item=$base.$file;
-					if((!$dirOnly or OC_FILESYSTEM::is_dir($item))){
+					if((!$dirOnly or OC_Filesystem::is_dir($item))){
 						$files[]=(object)array('id'=>$item,'label'=>$item,'name'=>$item);
 					}
 				}
diff --git a/files/ajax/delete.php b/files/ajax/delete.php
index 79caf4d0bb2..782db215dfc 100644
--- a/files/ajax/delete.php
+++ b/files/ajax/delete.php
@@ -7,7 +7,7 @@ require_once('../../lib/base.php');
 header( "Content-Type: application/jsonrequest" );
 
 // Check if we are a user
-if( !OC_USER::isLoggedIn()){
+if( !OC_User::isLoggedIn()){
 	echo json_encode( array( "status" => "error", "data" => array( "message" => "Authentication error" )));
 	exit();
 }
@@ -21,7 +21,7 @@ $filesWithError = '';
 $status = 'success';
 //Now delete
 foreach($files as $file) {
-    if( !OC_FILES::delete( $dir, $file )){
+    if( !OC_Files::delete( $dir, $file )){
 		$filesWithError .= $file . "\n";
 		$status = 'error';
 	}
diff --git a/files/ajax/download.php b/files/ajax/download.php
index 0b2f894a11b..2bbf1df4eca 100644
--- a/files/ajax/download.php
+++ b/files/ajax/download.php
@@ -25,13 +25,13 @@
 require_once('../../lib/base.php');
 
 // Check if we are a user
-if( !OC_USER::isLoggedIn()){
-	header( "Location: ".OC_HELPER::linkTo( "index.php" ));
+if( !OC_User::isLoggedIn()){
+	header( "Location: ".OC_Helper::linkTo( "index.php" ));
 	exit();
 }
 
 $files = $_GET["files"];
 $dir = $_GET["dir"];
 
-OC_FILES::get($dir,$files);
+OC_Files::get($dir,$files);
 ?>
diff --git a/files/ajax/list.php b/files/ajax/list.php
index ef43e72fcae..547bc91fb05 100644
--- a/files/ajax/list.php
+++ b/files/ajax/list.php
@@ -2,13 +2,12 @@
 
 // Init owncloud
 require_once('../../lib/base.php');
-require_once('../../lib/template.php');
 
 // We send json data
 header( "Content-Type: application/jsonrequest" );
 
 // Check if we are a user
-if( !OC_USER::isLoggedIn()){
+if( !OC_User::isLoggedIn()){
 	echo json_encode( array( "status" => "error", "data" => array( "message" => "Authentication error" )));
 	exit();
 }
@@ -29,7 +28,7 @@ if($doBreadcrumb){
 		}
 	}
 	
-	$breadcrumbNav = new OC_TEMPLATE( "files", "part.breadcrumb", "" );
+	$breadcrumbNav = new OC_Template( "files", "part.breadcrumb", "" );
 	$breadcrumbNav->assign( "breadcrumb", $breadcrumb );
 	
 	$data['breadcrumb'] = $breadcrumbNav->fetchPage();
@@ -37,12 +36,12 @@ if($doBreadcrumb){
 
 // make filelist
 $files = array();
-foreach( OC_FILES::getdirectorycontent( $dir ) as $i ){
-	$i["date"] = OC_UTIL::formatDate($i["mtime"] );
+foreach( OC_Files::getdirectorycontent( $dir ) as $i ){
+	$i["date"] = OC_Util::formatDate($i["mtime"] );
 	$files[] = $i;
 }
 
-$list = new OC_TEMPLATE( "files", "part.list", "" );
+$list = new OC_Template( "files", "part.list", "" );
 $list->assign( "files", $files );
 $data = array('files' => $list->fetchPage());
 
diff --git a/files/ajax/move.php b/files/ajax/move.php
index b1ba641c5b1..4224cbce6d0 100644
--- a/files/ajax/move.php
+++ b/files/ajax/move.php
@@ -7,7 +7,7 @@ require_once('../../lib/base.php');
 header( "Content-Type: application/jsonrequest" );
 
 // Check if we are a user
-if( !OC_USER::isLoggedIn()){
+if( !OC_User::isLoggedIn()){
 	echo json_encode( array( "status" => "error", "data" => array( "message" => "Authentication error" )));
 	exit();
 }
@@ -18,7 +18,7 @@ $file = $_GET["file"];
 $target = $_GET["target"];
 
 
-if(OC_FILES::move($dir,$file,$target,$file)){
+if(OC_Files::move($dir,$file,$target,$file)){
 	echo json_encode( array( "status" => 'success', "data" => array( "dir" => $dir, "files" => $file )));
 }else{
 	echo json_encode( array( "status" => 'error', "data" => array( "message" => "Could move $file" )));
diff --git a/files/ajax/newfolder.php b/files/ajax/newfolder.php
index 988e7f04012..610418583bd 100644
--- a/files/ajax/newfolder.php
+++ b/files/ajax/newfolder.php
@@ -7,7 +7,7 @@ require_once('../../lib/base.php');
 header( "Content-Type: application/jsonrequest" );
 
 // Check if we are a user
-if( !OC_USER::isLoggedIn()){
+if( !OC_User::isLoggedIn()){
 	echo json_encode( array( "status" => "error", "data" => array( "message" => "Authentication error" )));
 	exit();
 }
@@ -21,7 +21,7 @@ if($foldername == '') {
 	exit();
 }
 error_log('try to create ' . $foldername . ' in ' . $dir);
-if(OC_FILES::newFile($dir, $foldername, 'dir')) {
+if(OC_Files::newFile($dir, $foldername, 'dir')) {
 	echo json_encode( array( "status" => "success", "data" => array()));
 	exit();
 }
diff --git a/files/ajax/rename.php b/files/ajax/rename.php
index 7554aa0dd62..516077f6fda 100644
--- a/files/ajax/rename.php
+++ b/files/ajax/rename.php
@@ -7,7 +7,7 @@ require_once('../../lib/base.php');
 header( "Content-Type: application/jsonrequest" );
 
 // Check if we are a user
-if( !OC_USER::isLoggedIn()){
+if( !OC_User::isLoggedIn()){
 	echo json_encode( array( "status" => "error", "data" => array( "message" => "Authentication error" )));
 	exit();
 }
@@ -18,7 +18,7 @@ $file = $_GET["file"];
 $newname = $_GET["newname"];
 
 // Delete
-if( OC_FILES::move( $dir, $file, $dir, $newname )) {
+if( OC_Files::move( $dir, $file, $dir, $newname )) {
 	echo json_encode( array( "status" => "success", "data" => array( "dir" => $dir, "file" => $file, "newname" => $newname )));
 }
 else{
diff --git a/files/ajax/upload.php b/files/ajax/upload.php
index f47f9b3d282..5dcd2f2b6af 100644
--- a/files/ajax/upload.php
+++ b/files/ajax/upload.php
@@ -9,7 +9,7 @@ require_once('../../lib/base.php');
 header( "Content-Type: text/plain" );
 
 // Check if we are a user
-if( !OC_USER::isLoggedIn()){
+if( !OC_User::isLoggedIn()){
 	echo json_encode( array( "status" => "error", "data" => array( "message" => "Authentication error" )));
 	exit();
 }
@@ -24,8 +24,8 @@ if(strpos($dir,'..') === false){
 	$fileCount=count($files['name']);
 	for($i=0;$i<$fileCount;$i++){
 		$target='/' . stripslashes($dir) . $files['name'][$i];
-		if(OC_FILESYSTEM::fromUploadedFile($files['tmp_name'][$i],$target)){
-			$result[]=array( "status" => "success", 'mime'=>OC_FILESYSTEM::getMimeType($target),'size'=>OC_FILESYSTEM::filesize($target),'name'=>$files['name'][$i]);
+		if(OC_Filesystem::fromUploadedFile($files['tmp_name'][$i],$target)){
+			$result[]=array( "status" => "success", 'mime'=>OC_Filesystem::getMimeType($target),'size'=>OC_Filesystem::filesize($target),'name'=>$files['name'][$i]);
 		}
 	}
 	echo json_encode($result);
diff --git a/files/appinfo/app.php b/files/appinfo/app.php
index 06ca16e82d4..0f95b19f592 100644
--- a/files/appinfo/app.php
+++ b/files/appinfo/app.php
@@ -1,12 +1,12 @@
 <?php
 
-OC_APP::register( array( "order" => 2, "id" => "files", "name" => "Files" ));
+OC_App::register( array( "order" => 2, "id" => "files", "name" => "Files" ));
 
-OC_APP::addNavigationEntry( array( "id" => "files_index", "order" => 1, "href" => OC_HELPER::linkTo( "files", "index.php" ), "icon" => OC_HELPER::imagePath( "files", "home.png" ), "name" => "Files" ));
-OC_APP::addAdminPage( array( "id" => "files_administration", "order" => 3, "href" => OC_HELPER::linkTo( "files", "admin.php" ), "name" => "Files", "icon" => OC_HELPER::imagePath( "files", "folder.png" )));
+OC_App::addNavigationEntry( array( "id" => "files_index", "order" => 1, "href" => OC_Helper::linkTo( "files", "index.php" ), "icon" => OC_Helper::imagePath( "files", "home.png" ), "name" => "Files" ));
+OC_App::addAdminPage( array( "id" => "files_administration", "order" => 3, "href" => OC_Helper::linkTo( "files", "admin.php" ), "name" => "Files", "icon" => OC_Helper::imagePath( "files", "folder.png" )));
 
 
 // To add navigation sub entries use
-// OC_APP::addNavigationSubEntry( "files_index", array( ... ));
+// OC_App::addNavigationSubEntry( "files_index", array( ... ));
 
 ?>
diff --git a/files/css/files.css b/files/css/files.css
index 50b61a488d1..4aaca82f124 100644
--- a/files/css/files.css
+++ b/files/css/files.css
@@ -6,6 +6,7 @@
 #fileSelector, #file_upload_submit, #file_newfolder_submit { display:none; }
 .file_upload_filename, #file_newfolder_name { background-repeat:no-repeat; background-position:0.5em 0; padding-left:2em; }
 .file_upload_filename { background-image:url("../img/file.png"); font-weight:bold; }.file_upload_start { opacity:0;filter:alpha(opacity = 0); }
+input.highlight{ background-color:#ffc100; border:#dda600 1px solid; }
 
 #file_newfolder_name { background-image:url("../img/folder.png"); font-weight:bold; width:11em; }
 .file_upload_start, .file_upload_filename { position:absolute; top:0px; left:0px; width:11em; font-size:0.9em; }
@@ -16,13 +17,15 @@
 /* FILE TABLE */
 span#emptyfolder { position:absolute; margin:10em 0 0 10em; font-size:1.5em; font-weight:bold; color:#888; text-shadow:#fff 0 1px 0; }
 table { position:relative; top:37px; width:100%; }
-tbody tr:hover, tbody tr:active, tbody tr.selected { background-color:#eee; }
+tbody tr:hover, tbody tr:active, tbody tr.selected { background-color:#eee; height:1em; }
 tbody a { color:#000; }
 span.extention, td.date { color:#999; }
-div.crumb { float:left; display:block; background:no-repeat right 0; font-weight:bold; padding:8px 1.5em 0 1em; height:28px; /*36-8*/ }
+div.crumb { float:left; display:block; background:no-repeat right 0; padding:8px 1.5em 0 1em; height:28px; /*36-8*/ }
+div.crumb:last-child { font-weight:bold; }
 table tr.mouseOver td { background-color:#eee; }
-table th { padding:.5em; height:2em; }
+table th { height:2em; padding:0 .5em; color:#999; }
 table th .name { float:left; margin-left:.5em; }
+table th.multiselect { background:#ddd; color:#000; font-weight:bold; }
 table th, table td { border-bottom:1px solid #ddd; text-align:left; font-weight:normal; }
 table td { border-bottom:1px solid #eee; font-style:normal; }
 table th#headerSize, table td.filesize { width:5em; padding:0 1em; text-align:right; }
diff --git a/files/download.php b/files/download.php
index f7fbcd0f857..cc52b930f72 100644
--- a/files/download.php
+++ b/files/download.php
@@ -23,33 +23,32 @@
 
 // Init owncloud
 require_once('../lib/base.php');
-require( 'template.php' );
 
 // Check if we are a user
-if( !OC_USER::isLoggedIn()){
-	header( "Location: ".OC_HELPER::linkTo( "index.php" ));
+if( !OC_User::isLoggedIn()){
+	header( "Location: ".OC_Helper::linkTo( "index.php" ));
 	exit();
 }
 
 $filename = $_GET["file"];
 
-if(!OC_FILESYSTEM::file_exists($filename)){
+if(!OC_Filesystem::file_exists($filename)){
 	header("HTTP/1.0 404 Not Found");
-	$tmpl = new OC_TEMPLATE( '', '404', 'guest' );
+	$tmpl = new OC_Template( '', '404', 'guest' );
 	$tmpl->assign('file',$filename);
 	$tmpl->printPage();
 	exit;
 }
 
-$ftype=OC_FILESYSTEM::getMimeType( $filename );
+$ftype=OC_Filesystem::getMimeType( $filename );
 
 header('Content-Type:'.$ftype);
 header('Content-Disposition: attachment; filename="'.basename($filename).'"');
 header('Expires: 0');
 header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
 header('Pragma: public');
-header('Content-Length: '.OC_FILESYSTEM::filesize($filename));
+header('Content-Length: '.OC_Filesystem::filesize($filename));
 
 ob_end_clean();
-OC_FILESYSTEM::readfile( $filename );
+OC_Filesystem::readfile( $filename );
 ?>
diff --git a/files/index.php b/files/index.php
index 550f23541a0..821879b0346 100644
--- a/files/index.php
+++ b/files/index.php
@@ -24,29 +24,28 @@
 
 // Init owncloud
 require_once('../lib/base.php');
-require( 'template.php' );
 
 // Check if we are a user
-if( !OC_USER::isLoggedIn()){
-	header( "Location: ".OC_HELPER::linkTo( '', 'index.php' ));
+if( !OC_User::isLoggedIn()){
+	header( "Location: ".OC_Helper::linkTo( '', 'index.php' ));
 	exit();
 }
 
 // Load the files we need
-OC_UTIL::addStyle( "files", "files" );
-OC_UTIL::addScript( "files", "files" );
-OC_UTIL::addScript( 'files', 'filelist' );
-OC_UTIL::addScript( 'files', 'fileactions' );
+OC_Util::addStyle( "files", "files" );
+OC_Util::addScript( "files", "files" );
+OC_Util::addScript( 'files', 'filelist' );
+OC_Util::addScript( 'files', 'fileactions' );
 if(!isset($_SESSION['timezone'])){
-	OC_UTIL::addScript( 'files', 'timezone' );
+	OC_Util::addScript( 'files', 'timezone' );
 }
-OC_APP::setActiveNavigationEntry( "files_index" );
+OC_App::setActiveNavigationEntry( "files_index" );
 // Load the files
 $dir = isset( $_GET['dir'] ) ? $_GET['dir'] : '';
 
 $files = array();
-foreach( OC_FILES::getdirectorycontent( $dir ) as $i ){
-	$i["date"] = OC_UTIL::formatDate($i["mtime"] );
+foreach( OC_Files::getdirectorycontent( $dir ) as $i ){
+	$i["date"] = OC_Util::formatDate($i["mtime"] );
 	if($i['type']=='file'){
 		$i['extention']=substr($i['name'],strrpos($i['name'],'.'));
 		$i['basename']=substr($i['name'],0,strrpos($i['name'],'.'));
@@ -68,19 +67,19 @@ foreach( explode( "/", $dir ) as $i ){
 }
 
 // make breadcrumb und filelist markup
-$list = new OC_TEMPLATE( "files", "part.list", "" );
+$list = new OC_Template( "files", "part.list", "" );
 $list->assign( "files", $files );
-$breadcrumbNav = new OC_TEMPLATE( "files", "part.breadcrumb", "" );
+$breadcrumbNav = new OC_Template( "files", "part.breadcrumb", "" );
 $breadcrumbNav->assign( "breadcrumb", $breadcrumb );
 
-$maxUploadFilesize = OC_HELPER::computerFileSize(ini_get('upload_max_filesize'));
+$maxUploadFilesize = OC_Helper::computerFileSize(ini_get('upload_max_filesize'));
 
-$tmpl = new OC_TEMPLATE( "files", "index", "user" );
+$tmpl = new OC_Template( "files", "index", "user" );
 $tmpl->assign( "fileList", $list->fetchPage() );
 $tmpl->assign( "breadcrumb", $breadcrumbNav->fetchPage() );
 $tmpl->assign( 'dir', $dir);
 $tmpl->assign( 'uploadMaxFilesize', $maxUploadFilesize);
-$tmpl->assign( 'uploadMaxHumanFilesize', OC_HELPER::humanFileSize($maxUploadFilesize));
+$tmpl->assign( 'uploadMaxHumanFilesize', OC_Helper::humanFileSize($maxUploadFilesize));
 $tmpl->printPage();
 
 ?>
diff --git a/files/js/filelist.js b/files/js/filelist.js
index c3a2522fb6a..3f9b3984465 100644
--- a/files/js/filelist.js
+++ b/files/js/filelist.js
@@ -23,9 +23,9 @@ FileList={
 		}else{
 			simpleSize='Pending';
 		}
-		sizeColor = Math.round(200-Math.pow((size/(1024*1024)),2));
+		sizeColor = Math.round(200-size/(1024*1024)*2);
 		lastModifiedTime=Math.round(lastModified.getTime() / 1000);
-		modifiedColor=Math.round((Math.round((new Date()).getTime() / 1000)-lastModifiedTime)/60/60/24*5);
+		modifiedColor=Math.round((Math.round((new Date()).getTime() / 1000)-lastModifiedTime)/60/60/24*14);
 		html+='<td class="filesize" title="'+humanFileSize(size)+'" style="color:rgb('+sizeColor+','+sizeColor+','+sizeColor+')">'+simpleSize+'</td>';
 		html+='<td class="date" title="'+formatDate(lastModified)+'" style="color:rgb('+modifiedColor+','+modifiedColor+','+modifiedColor+')">'+relative_modified_date(lastModified.getTime() / 1000)+'</td>';
 		html+='</tr>';
@@ -66,6 +66,10 @@ FileList={
 	remove:function(name){
 		$('tr[data-file="'+name+'"] td.filename').draggable('destroy');
 		$('tr[data-file="'+name+'"]').remove();
+		if($('tr[data-file]').length==0){
+			$('#emptyfolder').show();
+			$('.file_upload_filename').addClass('highlight');
+		}
 	},
 	insertElement:function(name,type,element){
 		//find the correct spot to insert the file or folder
@@ -93,6 +97,8 @@ FileList={
 		}else{
 			$('#fileList').append(element);
 		}
+		$('#emptyfolder').hide();
+		$('.file_upload_filename').removeClass('highlight');
 	},
 	loadingDone:function(name){
 		$('tr[data-file="'+name+'"]').data('loading',false);
diff --git a/files/js/files.js b/files/js/files.js
index be7e48aeeeb..3d3d8ca49fd 100644
--- a/files/js/files.js
+++ b/files/js/files.js
@@ -1,4 +1,8 @@
 $(document).ready(function() {
+	if($('tr[data-file]').length==0){
+		$('.file_upload_filename').addClass('highlight');
+	}
+	
 	$('#file_action_panel').attr('activeAction', false);
 
 	//drag/drop of files
@@ -338,7 +342,7 @@ function procesSelection(){
 		$('#headerName>span.name').text('Name');
 		$('#headerSize').text('Size MB');
 		$('#modified').text('Modified');
-		$('th').css({background:'#fff',fontWeight:'normal'});
+		$('th').removeClass('multiselect');
 		$('.selectedActions').hide();
 	}else{
 		$('.selectedActions').show();
@@ -372,7 +376,7 @@ function procesSelection(){
 		}
 		$('#headerName>span.name').text(selection);
 		$('#modified').text('');
-		$('th').css({background:'#ddd', fontWeight:'bold'});
+		$('th').addClass('multiselect');
 	}
 }
 
@@ -433,4 +437,4 @@ function getMimeIcon(mime){
 		mime='file';
 	}
 	return OC.imagePath('core','mimetypes/'+mime+'.png');
-}
\ No newline at end of file
+}
diff --git a/files/settings.php b/files/settings.php
index 23aed4d1b86..1f2e9d9868c 100644
--- a/files/settings.php
+++ b/files/settings.php
@@ -24,23 +24,22 @@
 
 // Init owncloud
 require_once('../lib/base.php');
-require( 'template.php' );
 
 // Check if we are a user
-if( !OC_USER::isLoggedIn()){
-	header( "Location: ".OC_HELPER::linkTo( "index.php" ));
+if( !OC_User::isLoggedIn()){
+	header( "Location: ".OC_Helper::linkTo( "index.php" ));
 	exit();
 }
 
 // Load the files we need
-OC_UTIL::addStyle( "files", "files" );
-OC_UTIL::addScript( "files", "files" );
+OC_Util::addStyle( "files", "files" );
+OC_Util::addScript( "files", "files" );
 
 // Load the files
 $dir = isset( $_GET['dir'] ) ? $_GET['dir'] : '';
 
 $files = array();
-foreach( OC_FILES::getdirectorycontent( $dir ) as $i ){
+foreach( OC_Files::getdirectorycontent( $dir ) as $i ){
 	$i["date"] = date( $CONFIG_DATEFORMAT, $i["mtime"] );
 	$files[] = $i;
 }
@@ -56,7 +55,7 @@ foreach( explode( "/", $dir ) as $i ){
 }
 
 // return template
-$tmpl = new OC_TEMPLATE( "files", "index", "user" );
+$tmpl = new OC_Template( "files", "index", "user" );
 $tmpl->assign( 'files', $files );
 $tmpl->assign( "breadcrumb", $breadcrumb );
 $tmpl->printPage();
diff --git a/files/templates/admin.php b/files/templates/admin.php
index 40880d34911..e0cf2608301 100644
--- a/files/templates/admin.php
+++ b/files/templates/admin.php
@@ -1,4 +1,4 @@
-<?php OC_UTIL::addScript('files','admin'); ?>
+<?php OC_Util::addScript('files','admin'); ?>
 
 <form name="filesForm" action='#' method='post'>
 	<?php if($_['htaccessWorking']):?>
diff --git a/files/templates/part.list.php b/files/templates/part.list.php
index d249455c55c..93ed70990b7 100644
--- a/files/templates/part.list.php
+++ b/files/templates/part.list.php
@@ -1,10 +1,10 @@
-		<?php if(!$_['files']) echo '<span id="emptyfolder">Nothing in here. Upload something!</span><style>.file_upload_filename { background-color:#ffc100; border:#dda600 1px solid; }</style>';
-		foreach($_['files'] as $file):
+		<span id="emptyfolder" <?php if(count($_['files'])) echo 'style="display:none;"';?>>Nothing in here. Upload something!</span>
+		<?php foreach($_['files'] as $file):
 			$simple_file_size = simple_file_size($file['size']);
-			$simple_size_color = 200-intval($file['size']/(1024*1024)*5);
+			$simple_size_color = intval(200-$file['size']/(1024*1024)*2); // the bigger the file, the darker the shade of grey; megabytes*2
 			if($simple_size_color<0) $simple_size_color = 0;
 			$relative_modified_date = relative_modified_date($file['mtime']);
-			$relative_date_color = round((time()-$file['mtime'])/60/60/24*7); //days ago
+			$relative_date_color = round((time()-$file['mtime'])/60/60/24*14); // the older the file, the brighter the shade of grey; days*14
 			if($relative_date_color>200) $relative_date_color = 200; ?>
 			<tr data-file="<?php echo $file['name'];?>" data-type="<?php echo ($file['type'] == 'dir')?'dir':'file'?>" data-mime="<?php echo $file['mime']?>" data-size='<?php echo $file['size'];?>'>
 				<td class="filename">
diff --git a/files/webdav.php b/files/webdav.php
index 7dce0b48197..a59dee70c2e 100644
--- a/files/webdav.php
+++ b/files/webdav.php
@@ -28,11 +28,6 @@ $RUNTIME_NOSETUPFS = true;
 
 require_once('../lib/base.php');
 require_once('Sabre/autoload.php');
-require_once('Connector/Sabre/auth.php');
-require_once('Connector/Sabre/node.php');
-require_once('Connector/Sabre/file.php');
-require_once('Connector/Sabre/directory.php');
-require_once('Connector/Sabre/locks.php');
 
 // Create ownCloud Dir
 $publicDir = new OC_Connector_Sabre_Directory('');
diff --git a/help/appinfo/app.php b/help/appinfo/app.php
index fd46085ef77..2e82c0cd181 100644
--- a/help/appinfo/app.php
+++ b/help/appinfo/app.php
@@ -1,14 +1,14 @@
 <?php
 
-OC_APP::register( array( "order" => 1, "id" => "help", "name" => "Help" ));
+OC_App::register( array( "order" => 1, "id" => "help", "name" => "Help" ));
 
 // Workaround for having help as the last entry always
-$entry = array( "id" => "help", "order" => 1000, "href" => OC_HELPER::linkTo( "help", "index.php" ), "name" => "Help", "icon" => OC_HELPER::imagePath( "help", "help.png" ));
-if( isset( $_SESSION["user_id"] ) && OC_GROUP::inGroup( $_SESSION["user_id"], "admin" )){
-	OC_APP::addAdminPage( $entry );
+$entry = array( "id" => "help", "order" => 1000, "href" => OC_Helper::linkTo( "help", "index.php" ), "name" => "Help", "icon" => OC_Helper::imagePath( "help", "help.png" ));
+if( isset( $_SESSION["user_id"] ) && OC_Group::inGroup( $_SESSION["user_id"], "admin" )){
+	OC_App::addAdminPage( $entry );
 }
 else{
-	OC_APP::addSettingsPage( $entry );
+	OC_App::addSettingsPage( $entry );
 }
 
 ?>
diff --git a/help/index.php b/help/index.php
index de461c29412..f1adea0be01 100644
--- a/help/index.php
+++ b/help/index.php
@@ -1,9 +1,8 @@
 <?php
 
 require_once('../lib/base.php');
-require( 'template.php' );
-if( !OC_USER::isLoggedIn()){
-    header( "Location: ".OC_HELPER::linkTo( "index.php" ));
+if( !OC_User::isLoggedIn()){
+    header( "Location: ".OC_Helper::linkTo( "index.php" ));
     exit();
 }
 
@@ -13,13 +12,13 @@ $page=2;
 
 
 // Load the files we need
-OC_UTIL::addStyle( "help", "help" );
-OC_APP::setActiveNavigationEntry( "help" );
+OC_Util::addStyle( "help", "help" );
+OC_App::setActiveNavigationEntry( "help" );
 
-$kbe=OC_OCSCLIENT::getKnownledgebaseEntries();
+$kbe=OC_OCSClient::getKnownledgebaseEntries();
 
 
-$tmpl = new OC_TEMPLATE( "help", "index", "admin" );
+$tmpl = new OC_Template( "help", "index", "admin" );
 $tmpl->assign( "kbe", $kbe );
 $tmpl->assign( "pagecount", $pagecount );
 $tmpl->assign( "page", $page );
diff --git a/help/l10n/bg_BG.php b/help/l10n/bg_BG.php
new file mode 100644
index 00000000000..44f260693b3
--- /dev/null
+++ b/help/l10n/bg_BG.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Questions and Answers" => "Въпроси и отговори",
+"ASK A QUESTION" => "ЗАДАЙТЕ ВЪПРОС"
+);
diff --git a/help/l10n/fr.php b/help/l10n/fr.php
new file mode 100644
index 00000000000..2b9bf96684d
--- /dev/null
+++ b/help/l10n/fr.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Questions and Answers" => "Questions / Réponses",
+"ASK A QUESTION" => "Poser une question"
+);
diff --git a/help/templates/index.php b/help/templates/index.php
index 7105507f5eb..f239de217d0 100644
--- a/help/templates/index.php
+++ b/help/templates/index.php
@@ -17,8 +17,8 @@
 		</tbody>
 	</table>
 	<?php
-		$url=OC_HELPER::linkTo( "help", "index.php" ).'?page=';
-		$pageNavi=OC_UTIL::getPageNavi($_['pagecount'],$_['page'],$url);
+		$url=OC_Helper::linkTo( "help", "index.php" ).'?page=';
+		$pageNavi=OC_Util::getPageNavi($_['pagecount'],$_['page'],$url);
 		$pageNavi->printPage();
 	?>
 	<a target="_blank" class="prettybutton" href="http://apps.owncloud.com/knowledgebase/editquestion.php?action=new"><?php echo $l->t( 'ASK A QUESTION' ); ?></a>
diff --git a/index.php b/index.php
index dfd75492709..46dc990af68 100644
--- a/index.php
+++ b/index.php
@@ -23,18 +23,16 @@
 
 $RUNTIME_NOAPPS = TRUE; //no apps, yet
 
-require_once(dirname(__FILE__).'/lib/base.php');
-require_once('appconfig.php');
-require_once('template.php');
+require_once('lib/base.php');
 
-OC_UTIL::addScript('setup');
+OC_Util::addScript('setup');
 
-$not_installed = !OC_CONFIG::getValue('installed', false);
+$not_installed = !OC_Config::getValue('installed', false);
 $install_called = (isset($_POST['install']) AND $_POST['install']=='true');
 // First step : check if the server is correctly configured for ownCloud :
-$errors = OC_UTIL::checkServer();
+$errors = OC_Util::checkServer();
 if(count($errors) > 0) {
-	OC_TEMPLATE::printGuestPage("", "error", array("errors" => $errors));
+	OC_Template::printGuestPage("", "error", array("errors" => $errors));
 }
 
 // Setup required :
@@ -43,47 +41,47 @@ elseif($not_installed OR $install_called) {
 }
 
 // Someone is logged in :
-elseif(OC_USER::isLoggedIn()) {
+elseif(OC_User::isLoggedIn()) {
 	if(isset($_GET["logout"]) and ($_GET["logout"])) {
-		OC_USER::logout();
+		OC_User::logout();
 		header("Location: ".$WEBROOT.'/');
 		exit();
 	}
 	else {
-		header("Location: ".$WEBROOT.'/'.OC_APPCONFIG::getValue("core", "defaultpage", "files/index.php"));
+		header("Location: ".$WEBROOT.'/'.OC_Appconfig::getValue("core", "defaultpage", "files/index.php"));
 		exit();
 	}
 }
 
 // Someone wants to log in :
 elseif(isset($_POST["user"])) {
-	OC_APP::loadApps();
-	if(OC_USER::login($_POST["user"], $_POST["password"])) {
-		header("Location: ".$WEBROOT.'/'.OC_APPCONFIG::getValue("core", "defaultpage", "files/index.php"));
+	OC_App::loadApps();
+	if(OC_User::login($_POST["user"], $_POST["password"])) {
+		header("Location: ".$WEBROOT.'/'.OC_Appconfig::getValue("core", "defaultpage", "files/index.php"));
 		if(!empty($_POST["remember_login"])){
-			OC_USER::setUsernameInCookie($_POST["user"]);
+			OC_User::setUsernameInCookie($_POST["user"]);
 		}
 		else {
-			OC_USER::unsetUsernameInCookie();
+			OC_User::unsetUsernameInCookie();
 		}
 		exit();
 	}
 	else {
 		if(isset($_COOKIE["username"])){
-			OC_TEMPLATE::printGuestPage("", "login", array("error" => true, "username" => $_COOKIE["username"]));
+			OC_Template::printGuestPage("", "login", array("error" => true, "username" => $_COOKIE["username"]));
 		}else{
-			OC_TEMPLATE::printGuestPage("", "login", array("error" => true));
+			OC_Template::printGuestPage("", "login", array("error" => true));
 		}
 	}
 }
 
 // For all others cases, we display the guest page :
 else {
-	OC_APP::loadApps();
+	OC_App::loadApps();
 	if(isset($_COOKIE["username"])){
-		OC_TEMPLATE::printGuestPage("", "login", array("error" => false, "username" => $_COOKIE["username"]));
+		OC_Template::printGuestPage("", "login", array("error" => false, "username" => $_COOKIE["username"]));
 	}else{
-		OC_TEMPLATE::printGuestPage("", "login", array("error" => false));
+		OC_Template::printGuestPage("", "login", array("error" => false));
 	}
 }
 
diff --git a/l10n/templates/core.pot b/l10n/bg_BG/core.po
index 6bcadf8cfc7..63deb14b5c5 100644
--- a/l10n/templates/core.pot
+++ b/l10n/bg_BG/core.po
@@ -1,25 +1,25 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# 
+# Stefan Ilivanov <ilivanov@gmail.com>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
 "POT-Creation-Date: 2011-07-27 12:03+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"PO-Revision-Date: 2011-07-28 00:33+0000\n"
+"Last-Translator: ep98 <ilivanov@gmail.com>\n"
+"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.net/projects/p/owncloud/team/bg_BG/)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: bg_BG\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ../templates/404.php:15
 msgid "Error 404, Cloud not found"
-msgstr ""
+msgstr "Грешка 404, обклакът не намерен"
 
 #: ../templates/installation.php:6
 msgid "<strong>ownCloud</strong> is your personal web storage."
@@ -43,15 +43,15 @@ msgstr ""
 
 #: ../templates/installation.php:31
 msgid "Advanced"
-msgstr ""
+msgstr "Разширено"
 
 #: ../templates/installation.php:34
 msgid "Set where to store the data."
-msgstr ""
+msgstr "Изберете къде да записва данните"
 
 #: ../templates/installation.php:35
 msgid "Data directory:"
-msgstr ""
+msgstr "Директория за данни:"
 
 #: ../templates/installation.php:39
 msgid "Configure the database."
@@ -63,7 +63,7 @@ msgstr ""
 
 #: ../templates/installation.php:46
 msgid "SQLite"
-msgstr ""
+msgstr "SQLite"
 
 #: ../templates/installation.php:53
 msgid "MySQL will be used for the database."
@@ -79,29 +79,31 @@ msgstr ""
 
 #: ../templates/installation.php:61
 msgid "Database name:"
-msgstr ""
+msgstr "Име на базата:"
 
 #: ../templates/installation.php:62
 msgid "Host:"
-msgstr ""
+msgstr "хост:"
 
 #: ../templates/installation.php:63
 msgid "Table prefix:"
-msgstr ""
+msgstr "Префикс за таблиците:"
 
 #: ../templates/installation.php:69
 msgid "Finish setup"
-msgstr ""
+msgstr "Завършване на настройките"
 
 #: ../templates/layout.guest.php:33
 msgid ""
-"<a href=\"http://owncloud.org/\">ownCloud</a> is a personal cloud which runs "
-"on your own server.</p>"
+"<a href=\"http://owncloud.org/\">ownCloud</a> is a personal cloud which runs"
+" on your own server.</p>"
 msgstr ""
+"<a href=\"http://owncloud.org/\">ownCloud</a> е персонален облак който "
+"работи от Ваш собствен сървър.</p>"
 
 #: ../templates/login.php:6
 msgid "Login failed!"
-msgstr ""
+msgstr "Входа пропадна!"
 
 #: ../templates/login.php:11 ../templates/login.php:15
 msgid "Remember login"
@@ -109,16 +111,18 @@ msgstr ""
 
 #: ../templates/logout.php:1
 msgid "You are logged out."
-msgstr ""
+msgstr "Вие излязохте."
 
 #: ../templates/part.pagenavi.php:6
 msgid "prev"
-msgstr ""
+msgstr "пред."
 
 #: ../templates/part.pagenavi.php:26
 msgid "next"
-msgstr ""
+msgstr "следващо"
 
 #: ../templates/part.searchbox.php:3
 msgid "Search"
-msgstr ""
+msgstr "Търсене"
+
+
diff --git a/l10n/bg_BG/help.po b/l10n/bg_BG/help.po
new file mode 100644
index 00000000000..b204195b8be
--- /dev/null
+++ b/l10n/bg_BG/help.po
@@ -0,0 +1,28 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Stefan Ilivanov <ilivanov@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
+"POT-Creation-Date: 2011-07-27 12:03+0200\n"
+"PO-Revision-Date: 2011-07-25 21:21+0000\n"
+"Last-Translator: ep98 <ilivanov@gmail.com>\n"
+"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.net/projects/p/owncloud/team/bg_BG/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bg_BG\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ../templates/index.php:2
+msgid "Questions and Answers"
+msgstr "Въпроси и отговори"
+
+#: ../templates/index.php:24
+msgid "ASK A QUESTION"
+msgstr "ЗАДАЙТЕ ВЪПРОС"
+
+
diff --git a/l10n/bg_BG/log.po b/l10n/bg_BG/log.po
new file mode 100644
index 00000000000..ff886397449
--- /dev/null
+++ b/l10n/bg_BG/log.po
@@ -0,0 +1,68 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Stefan Ilivanov <ilivanov@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
+"POT-Creation-Date: 2011-07-27 12:03+0200\n"
+"PO-Revision-Date: 2011-07-25 21:23+0000\n"
+"Last-Translator: ep98 <ilivanov@gmail.com>\n"
+"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.net/projects/p/owncloud/team/bg_BG/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bg_BG\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ../templates/index.php:4
+msgid "Filter:"
+msgstr "Филтър:"
+
+#: ../templates/index.php:7
+msgid "Logins"
+msgstr "Влизания:"
+
+#: ../templates/index.php:8
+msgid "Logouts"
+msgstr "Изходи:"
+
+#: ../templates/index.php:9
+msgid "Downloads"
+msgstr "Тегления"
+
+#: ../templates/index.php:10
+msgid "Uploads"
+msgstr "Качвания"
+
+#: ../templates/index.php:11
+msgid "Creations"
+msgstr "Създавания:"
+
+#: ../templates/index.php:12
+msgid "Deletions"
+msgstr "Изтривания:"
+
+#: ../templates/index.php:15
+msgid "Show:"
+msgstr "Показва:"
+
+#: ../templates/index.php:16
+msgid "entries per page."
+msgstr "записа на страница."
+
+#: ../templates/index.php:26
+msgid "What"
+msgstr "Какво"
+
+#: ../templates/index.php:27
+msgid "When"
+msgstr "Кога"
+
+#: ../templates/index.php:45
+msgid "Clear log entries before"
+msgstr "Изчисти записите от журналите"
+
+
diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po
new file mode 100644
index 00000000000..e6ad1aaf6ee
--- /dev/null
+++ b/l10n/bg_BG/settings.po
@@ -0,0 +1,88 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Stefan Ilivanov <ilivanov@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
+"POT-Creation-Date: 2011-07-27 12:03+0200\n"
+"PO-Revision-Date: 2011-07-25 21:25+0000\n"
+"Last-Translator: ep98 <ilivanov@gmail.com>\n"
+"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.net/projects/p/owncloud/team/bg_BG/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bg_BG\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ../templates/index.php:3
+msgid "Account information"
+msgstr "Информация за профила"
+
+#: ../templates/index.php:5
+msgid "You're currently using"
+msgstr "Вие ползвате"
+
+#: ../templates/index.php:5
+msgid "of your"
+msgstr "на Вашето"
+
+#: ../templates/index.php:5
+msgid "space"
+msgstr "място"
+
+#: ../templates/index.php:11
+msgid "Change Password"
+msgstr "Промяна на парола"
+
+#: ../templates/index.php:12
+msgid "Your password got changed"
+msgstr "Вашата парола е сменена"
+
+#: ../templates/index.php:15
+msgid "Old password:"
+msgstr "Стара парола"
+
+#: ../templates/index.php:19
+msgid "New password"
+msgstr "Нова парола"
+
+#: ../templates/index.php:24
+msgid "Show new password"
+msgstr "Покажи новата парола"
+
+#: ../templates/index.php:34
+msgid "Language"
+msgstr "Език"
+
+#: ../ajax/changepassword.php:13 ../ajax/setlanguage.php:13
+msgid "Authentication error"
+msgstr "Проблем с индентификацията"
+
+#: ../ajax/changepassword.php:19
+msgid "You have to enter the old and the new password!"
+msgstr "Трябва да въведете новата и старата парола!"
+
+#: ../ajax/changepassword.php:25
+msgid "Your old password is wrong!"
+msgstr "Вашата стара парола е грешна!"
+
+#: ../ajax/changepassword.php:31
+msgid "Password changed"
+msgstr "Паролата е сменена"
+
+#: ../ajax/changepassword.php:34
+msgid "Unable to change password"
+msgstr "Невъзможна смяна на паролата"
+
+#: ../ajax/setlanguage.php:21
+msgid "Language changed"
+msgstr "Езика е сменен"
+
+#: ../ajax/setlanguage.php:23
+msgid "Invalid request"
+msgstr "Невалидна заявка"
+
+
diff --git a/l10n/da/admin.po b/l10n/da/admin.po
index be62e2cd3db..82c29165438 100644
--- a/l10n/da/admin.po
+++ b/l10n/da/admin.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
+# 
+# Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-20 22:00+0200\n"
-"PO-Revision-Date: 2011-06-21 15:08+0100\n"
-"Last-Translator: Mikkel Bjerg Larsen <mikkelbjerglarsen@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
+"POT-Creation-Date: 2011-07-27 12:03+0200\n"
+"PO-Revision-Date: 2011-07-28 00:09+0000\n"
+"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
+"Language-Team: Danish (http://www.transifex.net/projects/p/owncloud/team/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ../templates/app.php:22
 msgid "read more"
@@ -24,8 +25,7 @@ msgstr "læs mere"
 msgid "INSTALL"
 msgstr "INSTALLER"
 
-#: ../templates/app_noconn.php:6
-#: ../templates/apps.php:6
+#: ../templates/app_noconn.php:6 ../templates/apps.php:6
 msgid "Apps Repository"
 msgstr "Applikation arkiv"
 
@@ -33,10 +33,8 @@ msgstr "Applikation arkiv"
 msgid "Cannot connect to apps repository"
 msgstr "Kan ikke oprette forbindelse til applikations arkivet"
 
-#: ../templates/apps.php:13
-#: ../templates/users.php:6
-#: ../templates/users.php:20
-#: ../templates/users.php:50
+#: ../templates/apps.php:13 ../templates/users.php:6 ../templates/users.php:15
+#: ../templates/users.php:51
 msgid "Name"
 msgstr "Navn"
 
@@ -52,45 +50,44 @@ msgstr "Administration"
 msgid "System Settings"
 msgstr "System indstillinger"
 
-#: ../templates/users.php:13
-msgid "Add user"
-msgstr "Tilføj bruger"
+#: ../templates/users.php:2
+msgid "Users"
+msgstr "Brugere"
 
-#: ../templates/users.php:21
+#: ../templates/users.php:7 ../templates/users.php:47
+msgid "Groups"
+msgstr "Grupper"
+
+#: ../templates/users.php:16
 msgid "Password"
 msgstr "Kodeord"
 
-#: ../templates/users.php:30
-msgid "Create user"
-msgstr "Lav bruger"
+#: ../templates/users.php:25
+msgid "Create"
+msgstr ""
 
-#: ../templates/users.php:40
-#: ../templates/users.php:68
+#: ../templates/users.php:37 ../templates/users.php:69
 msgid "remove"
 msgstr "slet"
 
-#: ../templates/users.php:46
-#: ../templates/users.php:7
-msgid "Groups"
-msgstr "Grupper"
-
-#: ../templates/users.php:58
+#: ../templates/users.php:59
 msgid "Create group"
 msgstr "Lav gruppe"
 
-#: ../templates/users.php:94
+#: ../templates/users.php:95
 msgid "Force new password:"
 msgstr "Tving ny adgangskode"
 
-#: ../templates/users.php:96
+#: ../templates/users.php:97
 msgid "Set"
 msgstr "Indstil"
 
-#: ../templates/users.php:102
+#: ../templates/users.php:103
 msgid "Do you really want to delete user"
 msgstr "Vil du virkelig slette denne bruger?"
 
-#: ../templates/users.php:109
+#: ../templates/users.php:110
 msgid "Do you really want to delete group"
 msgstr "Vil du virkelig slette denne gruppe?"
 
+
diff --git a/l10n/da/core.po b/l10n/da/core.po
index df83958287b..0b37d9ac8ce 100644
--- a/l10n/da/core.po
+++ b/l10n/da/core.po
@@ -1,44 +1,44 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-20 22:00+0200\n"
-"PO-Revision-Date: 2011-06-21 15:10+0100\n"
-"Last-Translator: Mikkel Bjerg Larsen <mikkelbjerglarsen@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
+"POT-Creation-Date: 2011-07-27 12:03+0200\n"
+"PO-Revision-Date: 2011-07-28 00:33+0000\n"
+"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
+"Language-Team: Danish (http://www.transifex.net/projects/p/owncloud/team/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ../templates/404.php:15
 msgid "Error 404, Cloud not found"
 msgstr "Fejl 404, Skyen kan ikke findes"
 
 #: ../templates/installation.php:6
-msgid "Welcome to <strong>ownCloud</strong>, your personnal cloud."
-msgstr "Velkommen til <strong>ownCloud</strong>, din personlige Sky."
+msgid "<strong>ownCloud</strong> is your personal web storage."
+msgstr ""
 
 #: ../templates/installation.php:7
-msgid "To finish the installation, please follow the steps below."
-msgstr "For at fuldføre installationen, følg venligst nedenstående trin"
+msgid "Finish the setup by following the steps below."
+msgstr ""
 
 #: ../templates/installation.php:26
-msgid "Create an <strong>admin account.</strong>"
-msgstr "Lav en <strong>administrator konto.</strong>"
+msgid "Create an <strong>admin account</strong>."
+msgstr ""
 
 #: ../templates/installation.php:27
-msgid "Login:"
-msgstr "Login:"
+msgid "Username"
+msgstr ""
 
 #: ../templates/installation.php:28
-msgid "Password:"
-msgstr "Kodeord:"
+msgid "Password"
+msgstr ""
 
 #: ../templates/installation.php:31
 msgid "Advanced"
@@ -53,53 +53,61 @@ msgid "Data directory:"
 msgstr "Data mappe:"
 
 #: ../templates/installation.php:39
-msgid "Configure your database."
-msgstr "Konfigurer din database."
+msgid "Configure the database."
+msgstr ""
 
 #: ../templates/installation.php:43
-msgid "I will use a SQLite database. You have nothing to do!"
-msgstr "Jeg vil benytte en SQLite database. Du skal ikke gøre noget!"
+msgid "SQLite will be used for the database. You have nothing to do."
+msgstr ""
 
 #: ../templates/installation.php:46
 msgid "SQLite"
 msgstr "SQLite"
 
 #: ../templates/installation.php:53
-msgid "I will use a MySQL database."
-msgstr "Jeg vil benytte en MySQL database."
+msgid "MySQL will be used for the database."
+msgstr ""
 
 #: ../templates/installation.php:59
-msgid "Host:"
-msgstr "Host:"
+msgid "MySQL username:"
+msgstr ""
 
 #: ../templates/installation.php:60
-msgid "Database name:"
-msgstr "Database navn:"
+msgid "MySQL password:"
+msgstr ""
 
 #: ../templates/installation.php:61
-msgid "Table prefix:"
-msgstr "Tabel prefix:"
+msgid "Database name:"
+msgstr "Database navn:"
 
 #: ../templates/installation.php:62
-msgid "MySQL user login:"
-msgstr "MySQL bruger login:"
+msgid "Host:"
+msgstr "Host:"
 
 #: ../templates/installation.php:63
-msgid "MySQL user password:"
-msgstr "MySQL bruger password:"
+msgid "Table prefix:"
+msgstr "Tabel prefix:"
 
-#: ../templates/installation.php:68
+#: ../templates/installation.php:69
 msgid "Finish setup"
 msgstr "Afslut installation"
 
-#: ../templates/layout.guest.php:20
-msgid "<a href=\"http://owncloud.org/\">ownCloud</a> is a personal cloud which runs on your own server.</p>"
-msgstr "<a href=\"http://owncloud.org/\">ownCloud</a> er din personly sky der køre på din egen server.</p>"
+#: ../templates/layout.guest.php:33
+msgid ""
+"<a href=\"http://owncloud.org/\">ownCloud</a> is a personal cloud which runs"
+" on your own server.</p>"
+msgstr ""
+"<a href=\"http://owncloud.org/\">ownCloud</a> er din personly sky der køre "
+"på din egen server.</p>"
 
 #: ../templates/login.php:6
 msgid "Login failed!"
 msgstr "Login mislykkedes"
 
+#: ../templates/login.php:11 ../templates/login.php:15
+msgid "Remember login"
+msgstr ""
+
 #: ../templates/logout.php:1
 msgid "You are logged out."
 msgstr "Du er nu logget ud"
@@ -116,3 +124,4 @@ msgstr "næste"
 msgid "Search"
 msgstr "Søg"
 
+
diff --git a/l10n/da/help.po b/l10n/da/help.po
index d09d34e0aa8..e3300adc4d4 100644
--- a/l10n/da/help.po
+++ b/l10n/da/help.po
@@ -1,26 +1,27 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-20 22:00+0200\n"
-"PO-Revision-Date: 2011-06-21 15:02+0100\n"
-"Last-Translator: Mikkel Bjerg Larsen <mikkelbjerglarsen@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
+"POT-Creation-Date: 2011-07-27 12:03+0200\n"
+"PO-Revision-Date: 2011-07-25 16:17+0000\n"
+"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
+"Language-Team: Danish (http://www.transifex.net/projects/p/owncloud/team/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ../templates/index.php:2
 msgid "Questions and Answers"
 msgstr "Spørgsmål og Svar"
 
-#: ../templates/index.php:21
+#: ../templates/index.php:24
 msgid "ASK A QUESTION"
 msgstr "STIL ET SPØRGSMÅL"
 
+
diff --git a/l10n/da/log.po b/l10n/da/log.po
index 4c81d97ea4b..b52c2ad512c 100644
--- a/l10n/da/log.po
+++ b/l10n/da/log.po
@@ -1,21 +1,20 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-20 22:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
+"POT-Creation-Date: 2011-07-27 12:03+0200\n"
+"PO-Revision-Date: 2011-07-25 16:17+0000\n"
+"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
+"Language-Team: Danish (http://www.transifex.net/projects/p/owncloud/team/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ../templates/index.php:4
 msgid "Filter:"
@@ -64,3 +63,5 @@ msgstr "Hvornår"
 #: ../templates/index.php:45
 msgid "Clear log entries before"
 msgstr "Slet log poster før"
+
+
diff --git a/l10n/da/settings.po b/l10n/da/settings.po
index c7981c921fb..17e84dbfcd0 100644
--- a/l10n/da/settings.po
+++ b/l10n/da/settings.po
@@ -1,20 +1,20 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-20 22:00+0200\n"
-"PO-Revision-Date: 2011-06-21 15:00+0100\n"
-"Last-Translator: Mikkel Bjerg Larsen <mikkelbjerglarsen@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
+"POT-Creation-Date: 2011-07-27 12:03+0200\n"
+"PO-Revision-Date: 2011-07-25 16:17+0000\n"
+"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
+"Language-Team: Danish (http://www.transifex.net/projects/p/owncloud/team/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ../templates/index.php:3
 msgid "Account information"
@@ -56,8 +56,7 @@ msgstr "Vis den nye adgangskode"
 msgid "Language"
 msgstr "Sprog"
 
-#: ../ajax/changepassword.php:13
-#: ../ajax/setlanguage.php:13
+#: ../ajax/changepassword.php:13 ../ajax/setlanguage.php:13
 msgid "Authentication error"
 msgstr "Godkendelsesfejl"
 
@@ -85,3 +84,4 @@ msgstr "Sprog ændret"
 msgid "Invalid request"
 msgstr "Invalid forespørgsel"
 
+
diff --git a/l10n/de/admin.po b/l10n/de/admin.po
index 58db3b78e6d..4495f3994e1 100644
--- a/l10n/de/admin.po
+++ b/l10n/de/admin.po
@@ -1,21 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# 
+# Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-20 22:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
+"POT-Creation-Date: 2011-07-27 12:03+0200\n"
+"PO-Revision-Date: 2011-07-28 00:09+0000\n"
+"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
+"Language-Team: German (http://www.transifex.net/projects/p/owncloud/team/de/)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ../templates/app.php:22
 msgid "read more"
@@ -33,8 +33,8 @@ msgstr "Anwendungen"
 msgid "Cannot connect to apps repository"
 msgstr "Verbindung fehlgeschlagen"
 
-#: ../templates/apps.php:13 ../templates/users.php:6 ../templates/users.php:20
-#: ../templates/users.php:50
+#: ../templates/apps.php:13 ../templates/users.php:6 ../templates/users.php:15
+#: ../templates/users.php:51
 msgid "Name"
 msgstr "Name"
 
@@ -50,42 +50,44 @@ msgstr "Verwaltung"
 msgid "System Settings"
 msgstr "Systemeinstellungen"
 
-#: ../templates/users.php:7 ../templates/users.php:46
+#: ../templates/users.php:2
+msgid "Users"
+msgstr "Nutzer"
+
+#: ../templates/users.php:7 ../templates/users.php:47
 msgid "Groups"
 msgstr "Gruppen"
 
-#: ../templates/users.php:13
-msgid "Add user"
-msgstr "Nutzer hinzufügen"
-
-#: ../templates/users.php:21
+#: ../templates/users.php:16
 msgid "Password"
 msgstr "Passwort"
 
-#: ../templates/users.php:30
-msgid "Create user"
-msgstr "Nutzer erstellen"
+#: ../templates/users.php:25
+msgid "Create"
+msgstr "Erstellen"
 
-#: ../templates/users.php:40 ../templates/users.php:68
+#: ../templates/users.php:37 ../templates/users.php:69
 msgid "remove"
 msgstr "entfernen"
 
-#: ../templates/users.php:58
+#: ../templates/users.php:59
 msgid "Create group"
 msgstr "Gruppe erstellen"
 
-#: ../templates/users.php:94
+#: ../templates/users.php:95
 msgid "Force new password:"
 msgstr "Neues Passwort:"
 
-#: ../templates/users.php:96
+#: ../templates/users.php:97
 msgid "Set"
 msgstr "OK"
 
-#: ../templates/users.php:102
+#: ../templates/users.php:103
 msgid "Do you really want to delete user"
 msgstr "Möchtest du den Nutzer wirklich entfernen?"
 
-#: ../templates/users.php:109
+#: ../templates/users.php:110
 msgid "Do you really want to delete group"
 msgstr "Möchtest du die Gruppe wirklich entfernen?"
+
+
diff --git a/l10n/de/core.po b/l10n/de/core.po
index b78c7996190..20aa6c30ecc 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.po
@@ -1,45 +1,45 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# 
+# Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-20 22:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
+"POT-Creation-Date: 2011-07-27 12:03+0200\n"
+"PO-Revision-Date: 2011-07-28 12:04+0000\n"
+"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
+"Language-Team: German (http://www.transifex.net/projects/p/owncloud/team/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ../templates/404.php:15
 msgid "Error 404, Cloud not found"
 msgstr "Cloud konnte nicht gefunden werden."
 
 #: ../templates/installation.php:6
-msgid "Welcome to <strong>ownCloud</strong>, your personnal cloud."
-msgstr "Willkommen bei <strong>ownCloud</strong>, deinem persönlichen Online-Speicher."
+msgid "<strong>ownCloud</strong> is your personal web storage."
+msgstr "<strong>ownCloud</strong> ist dein persönlicher Online-Speicher."
 
 #: ../templates/installation.php:7
-msgid "To finish the installation, please follow the steps below."
+msgid "Finish the setup by following the steps below."
 msgstr "Die Installation ist fast abgeschlossen."
 
 #: ../templates/installation.php:26
-msgid "Create an <strong>admin account.</strong>"
-msgstr "<strong>Verwaltungskonto</strong> erstellen."
+msgid "Create an <strong>admin account</strong>."
+msgstr "<strong>Verwalter-Konto</strong> erstellen"
 
 #: ../templates/installation.php:27
-msgid "Login:"
-msgstr "Benutzername:"
+msgid "Username"
+msgstr "Nutzername"
 
 #: ../templates/installation.php:28
-msgid "Password:"
-msgstr "Passwort:"
+msgid "Password"
+msgstr "Passwort"
 
 #: ../templates/installation.php:31
 msgid "Advanced"
@@ -54,69 +54,75 @@ msgid "Data directory:"
 msgstr "Datenverzeichnis:"
 
 #: ../templates/installation.php:39
-msgid "Configure your database."
-msgstr "Datenbank einstellen."
+msgid "Configure the database."
+msgstr "Datenbank einrichten"
 
 #: ../templates/installation.php:43
-msgid "I will use a SQLite database. You have nothing to do!"
-msgstr "Es wird eine SQLite-Datenbank genutzt."
+msgid "SQLite will be used for the database. You have nothing to do."
+msgstr "SQLite wird als Datenbank genutzt."
 
 #: ../templates/installation.php:46
 msgid "SQLite"
 msgstr "SQLite"
 
 #: ../templates/installation.php:53
-msgid "I will use a MySQL database."
-msgstr "Es wird eine MySQL-Datenbank genutzt."
+msgid "MySQL will be used for the database."
+msgstr "MySQL wird als Datenbank genutzt."
 
 #: ../templates/installation.php:59
-msgid "Host:"
-msgstr "Host:"
+msgid "MySQL username:"
+msgstr "MySQL-Nutzername:"
 
 #: ../templates/installation.php:60
-msgid "Database name:"
-msgstr "Datenbankname:"
+msgid "MySQL password:"
+msgstr "MySQL-Passwort:"
 
 #: ../templates/installation.php:61
-msgid "Table prefix:"
-msgstr "Tabellenpräfix:"
+msgid "Database name:"
+msgstr "Datenbankname:"
 
 #: ../templates/installation.php:62
-msgid "MySQL user login:"
-msgstr "MySQL-Nutzername:"
+msgid "Host:"
+msgstr "Host:"
 
 #: ../templates/installation.php:63
-msgid "MySQL user password:"
-msgstr "MySQL-Passwort:"
+msgid "Table prefix:"
+msgstr "Tabellenpräfix:"
 
-#: ../templates/layout.guest.php:17 ../templates/layout.guest.php:20
+#: ../templates/installation.php:69
+msgid "Finish setup"
+msgstr "Installation abschließen"
+
+#: ../templates/layout.guest.php:33
 msgid ""
-"<a href=\"http://owncloud.org/\">ownCloud</a> is a personal cloud which runs "
-"on your own server.</p>"
+"<a href=\"http://owncloud.org/\">ownCloud</a> is a personal cloud which runs"
+" on your own server.</p>"
 msgstr ""
-"<a href=\"http://owncloud.org/\">ownCloud</a> ist ein privater Online-Speicher "
-"für deinen eigenen Server.</p>"
+"<a href=\"http://owncloud.org/\">ownCloud</a> ist ein privater Online-"
+"Speicher für deinen eigenen Server.</p>"
 
 #: ../templates/login.php:6
 msgid "Login failed!"
-msgstr "Anmeldung Fehlgeschlagen!"
+msgstr "Anmeldung fehlgeschlagen!"
+
+#: ../templates/login.php:11 ../templates/login.php:15
+msgid "Remember login"
+msgstr "Anmeldung merken"
 
 #: ../templates/logout.php:1
 msgid "You are logged out."
-msgstr "Sie wurden abgemeldet."
+msgstr "Erfolgreich abgemeldet."
 
 #: ../templates/part.pagenavi.php:6
 msgid "prev"
-msgstr "zurück"
+msgstr "Zurück"
 
 #: ../templates/part.pagenavi.php:26
 msgid "next"
-msgstr "weiter"
+msgstr "Weiter"
 
 #: ../templates/part.searchbox.php:3
 msgid "Search"
 msgstr "Suchen"
 
-#: ../templates/installation.php:68
-msgid "Finish setup"
-msgstr "Installation abschließen"
+
diff --git a/l10n/de/help.po b/l10n/de/help.po
index 37029fffc70..2b9f1eaa91e 100644
--- a/l10n/de/help.po
+++ b/l10n/de/help.po
@@ -1,26 +1,27 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-20 22:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
+"POT-Creation-Date: 2011-07-27 12:03+0200\n"
+"PO-Revision-Date: 2011-07-25 16:15+0000\n"
+"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
+"Language-Team: German (http://www.transifex.net/projects/p/owncloud/team/de/)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ../templates/index.php:2
 msgid "Questions and Answers"
 msgstr "Fragen & Antworten"
 
-#: ../templates/index.php:21
+#: ../templates/index.php:24
 msgid "ASK A QUESTION"
 msgstr "Stell eine Frage"
+
+
diff --git a/l10n/de/log.po b/l10n/de/log.po
index f552e1fd14c..c249e412a7b 100644
--- a/l10n/de/log.po
+++ b/l10n/de/log.po
@@ -1,21 +1,21 @@
+# SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Jakob Sack <mail@jakobsack.de>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-20 22:00+0200\n"
-"PO-Revision-Date: 2011-06-21 16:44+0200\n"
-"Last-Translator: Jakob Sack <mail@jakobsack.de>\n"
-"Language-Team: German <kde-i18n-de@kde.org>\n"
-"Language: \n"
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
+"POT-Creation-Date: 2011-07-27 12:03+0200\n"
+"PO-Revision-Date: 2011-07-25 16:15+0000\n"
+"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
+"Language-Team: German (http://www.transifex.net/projects/p/owncloud/team/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.2\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ../templates/index.php:4
 msgid "Filter:"
@@ -65,3 +65,4 @@ msgstr "Wann"
 msgid "Clear log entries before"
 msgstr "Lösche Einträge vor dem"
 
+
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index 423514bc130..e1ecc38c991 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.po
@@ -1,21 +1,20 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-20 22:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
+"POT-Creation-Date: 2011-07-27 12:03+0200\n"
+"PO-Revision-Date: 2011-07-25 16:15+0000\n"
+"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
+"Language-Team: German (http://www.transifex.net/projects/p/owncloud/team/de/)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ../templates/index.php:3
 msgid "Account information"
@@ -84,3 +83,5 @@ msgstr "Sprache geändert"
 #: ../ajax/setlanguage.php:23
 msgid "Invalid request"
 msgstr "Ungültige Anfrage"
+
+
diff --git a/l10n/templates/admin.pot b/l10n/fr/admin.po
index d6233365185..b1dad1da675 100644
--- a/l10n/templates/admin.pot
+++ b/l10n/fr/admin.po
@@ -1,91 +1,93 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# 
+#   <rom1dep@gmail.com>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
 "POT-Creation-Date: 2011-07-27 12:03+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"PO-Revision-Date: 2011-07-30 07:29+0000\n"
+"Last-Translator: rom1dep <rom1dep@gmail.com>\n"
+"Language-Team: French (http://www.transifex.net/projects/p/owncloud/team/fr/)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
 #: ../templates/app.php:22
 msgid "read more"
-msgstr ""
+msgstr "en lire plus"
 
 #: ../templates/app.php:24
 msgid "INSTALL"
-msgstr ""
+msgstr "INSTALLATION"
 
 #: ../templates/app_noconn.php:6 ../templates/apps.php:6
 msgid "Apps Repository"
-msgstr ""
+msgstr "Répertoire d'applications"
 
 #: ../templates/app_noconn.php:7
 msgid "Cannot connect to apps repository"
-msgstr ""
+msgstr "Impossible de se connecter au répertoire d'applications"
 
 #: ../templates/apps.php:13 ../templates/users.php:6 ../templates/users.php:15
 #: ../templates/users.php:51
 msgid "Name"
-msgstr ""
+msgstr "Nom"
 
 #: ../templates/apps.php:14
 msgid "Modified"
-msgstr ""
+msgstr "Modifié le"
 
 #: ../templates/system.php:6
 msgid "Administration"
-msgstr ""
+msgstr "Administration"
 
 #: ../templates/system.php:7
 msgid "System Settings"
-msgstr ""
+msgstr "Préférences Système"
 
 #: ../templates/users.php:2
 msgid "Users"
-msgstr ""
+msgstr "Utilisateurs"
 
 #: ../templates/users.php:7 ../templates/users.php:47
 msgid "Groups"
-msgstr ""
+msgstr "Groupes"
 
 #: ../templates/users.php:16
 msgid "Password"
-msgstr ""
+msgstr "Mot de passe"
 
 #: ../templates/users.php:25
 msgid "Create"
-msgstr ""
+msgstr "Créer"
 
 #: ../templates/users.php:37 ../templates/users.php:69
 msgid "remove"
-msgstr ""
+msgstr "retirer"
 
 #: ../templates/users.php:59
 msgid "Create group"
-msgstr ""
+msgstr "Créer un groupe"
 
 #: ../templates/users.php:95
 msgid "Force new password:"
-msgstr ""
+msgstr "Forcer un nouveau mot de passe :"
 
 #: ../templates/users.php:97
 msgid "Set"
-msgstr ""
+msgstr "Appliquer"
 
 #: ../templates/users.php:103
 msgid "Do you really want to delete user"
-msgstr ""
+msgstr "Voulez-vous réellement supprimer cet utilisateur"
 
 #: ../templates/users.php:110
 msgid "Do you really want to delete group"
-msgstr ""
+msgstr "Voulez-vous réellement supprimer ce groupe"
+
+
diff --git a/l10n/fr/core.po b/l10n/fr/core.po
new file mode 100644
index 00000000000..9546fca7ead
--- /dev/null
+++ b/l10n/fr/core.po
@@ -0,0 +1,130 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+#   <rom1dep@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
+"POT-Creation-Date: 2011-07-27 12:03+0200\n"
+"PO-Revision-Date: 2011-07-30 07:25+0000\n"
+"Last-Translator: rom1dep <rom1dep@gmail.com>\n"
+"Language-Team: French (http://www.transifex.net/projects/p/owncloud/team/fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+
+#: ../templates/404.php:15
+msgid "Error 404, Cloud not found"
+msgstr "Erreur 404, la page demandée n'existe pas"
+
+#: ../templates/installation.php:6
+msgid "<strong>ownCloud</strong> is your personal web storage."
+msgstr "<strong>ownCloud</strong> est votre espace de stockage web personnel."
+
+#: ../templates/installation.php:7
+msgid "Finish the setup by following the steps below."
+msgstr "Terminez l'installation en suivant les étapes ci-dessous."
+
+#: ../templates/installation.php:26
+msgid "Create an <strong>admin account</strong>."
+msgstr "Veuillez créer un <strong>compte administrateur.</strong>"
+
+#: ../templates/installation.php:27
+msgid "Username"
+msgstr "Nom d'utilisateur"
+
+#: ../templates/installation.php:28
+msgid "Password"
+msgstr "Mot de passe"
+
+#: ../templates/installation.php:31
+msgid "Advanced"
+msgstr "Avancé"
+
+#: ../templates/installation.php:34
+msgid "Set where to store the data."
+msgstr "Sélectionnez où sauvegarder les données"
+
+#: ../templates/installation.php:35
+msgid "Data directory:"
+msgstr "Répertoire de données"
+
+#: ../templates/installation.php:39
+msgid "Configure the database."
+msgstr "Configurez la base de données."
+
+#: ../templates/installation.php:43
+msgid "SQLite will be used for the database. You have nothing to do."
+msgstr ""
+"SQLite sera utilisé comme moteur pour la base de données. Vous n'avez rien "
+"de plus à faire."
+
+#: ../templates/installation.php:46
+msgid "SQLite"
+msgstr "SQLite"
+
+#: ../templates/installation.php:53
+msgid "MySQL will be used for the database."
+msgstr "MySQL sera utilisé comme moteur pour la base de données."
+
+#: ../templates/installation.php:59
+msgid "MySQL username:"
+msgstr "Nom d'utilisateur MySQL :"
+
+#: ../templates/installation.php:60
+msgid "MySQL password:"
+msgstr "Mot de passe MySQL :"
+
+#: ../templates/installation.php:61
+msgid "Database name:"
+msgstr "Nom de la base de données :"
+
+#: ../templates/installation.php:62
+msgid "Host:"
+msgstr "Hôte :"
+
+#: ../templates/installation.php:63
+msgid "Table prefix:"
+msgstr "Préfixe de table :"
+
+#: ../templates/installation.php:69
+msgid "Finish setup"
+msgstr "Terminer l'installation"
+
+#: ../templates/layout.guest.php:33
+msgid ""
+"<a href=\"http://owncloud.org/\">ownCloud</a> is a personal cloud which runs"
+" on your own server.</p>"
+msgstr ""
+"<a href=\"http://owncloud.org/\">ownCloud</a> est votre solution cloud "
+"personnelle qui tourne sur votre propre serveur.</p>"
+
+#: ../templates/login.php:6
+msgid "Login failed!"
+msgstr "Échec de la connexion !"
+
+#: ../templates/login.php:11 ../templates/login.php:15
+msgid "Remember login"
+msgstr "Se souvenir de moi"
+
+#: ../templates/logout.php:1
+msgid "You are logged out."
+msgstr "Vous êtes désormais déconnecté."
+
+#: ../templates/part.pagenavi.php:6
+msgid "prev"
+msgstr "précédent"
+
+#: ../templates/part.pagenavi.php:26
+msgid "next"
+msgstr "suivant"
+
+#: ../templates/part.searchbox.php:3
+msgid "Search"
+msgstr "Rechercher"
+
+
diff --git a/l10n/fr/help.po b/l10n/fr/help.po
new file mode 100644
index 00000000000..d8c869024b9
--- /dev/null
+++ b/l10n/fr/help.po
@@ -0,0 +1,28 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+#   <rom1dep@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
+"POT-Creation-Date: 2011-07-27 12:03+0200\n"
+"PO-Revision-Date: 2011-07-30 07:17+0000\n"
+"Last-Translator: rom1dep <rom1dep@gmail.com>\n"
+"Language-Team: French (http://www.transifex.net/projects/p/owncloud/team/fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+
+#: ../templates/index.php:2
+msgid "Questions and Answers"
+msgstr "Questions / Réponses"
+
+#: ../templates/index.php:24
+msgid "ASK A QUESTION"
+msgstr "Poser une question"
+
+
diff --git a/l10n/templates/log.pot b/l10n/fr/log.po
index ea98e5c2b14..4e59e55d392 100644
--- a/l10n/templates/log.pot
+++ b/l10n/fr/log.po
@@ -1,66 +1,68 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# 
+#   <rom1dep@gmail.com>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
 "POT-Creation-Date: 2011-07-27 12:03+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"PO-Revision-Date: 2011-07-30 07:16+0000\n"
+"Last-Translator: rom1dep <rom1dep@gmail.com>\n"
+"Language-Team: French (http://www.transifex.net/projects/p/owncloud/team/fr/)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
 #: ../templates/index.php:4
 msgid "Filter:"
-msgstr ""
+msgstr "Filtre :"
 
 #: ../templates/index.php:7
 msgid "Logins"
-msgstr ""
+msgstr "Connexions"
 
 #: ../templates/index.php:8
 msgid "Logouts"
-msgstr ""
+msgstr "Déconnexions"
 
 #: ../templates/index.php:9
 msgid "Downloads"
-msgstr ""
+msgstr "Téléchargements"
 
 #: ../templates/index.php:10
 msgid "Uploads"
-msgstr ""
+msgstr "Téléversements"
 
 #: ../templates/index.php:11
 msgid "Creations"
-msgstr ""
+msgstr "Créations"
 
 #: ../templates/index.php:12
 msgid "Deletions"
-msgstr ""
+msgstr "Suppressions"
 
 #: ../templates/index.php:15
 msgid "Show:"
-msgstr ""
+msgstr "Afficher :"
 
 #: ../templates/index.php:16
 msgid "entries per page."
-msgstr ""
+msgstr "entrées par page."
 
 #: ../templates/index.php:26
 msgid "What"
-msgstr ""
+msgstr "Quoi"
 
 #: ../templates/index.php:27
 msgid "When"
-msgstr ""
+msgstr "Quand"
 
 #: ../templates/index.php:45
 msgid "Clear log entries before"
-msgstr ""
+msgstr "Effacer les entrées du journal au préalable"
+
+
diff --git a/l10n/templates/settings.pot b/l10n/fr/settings.po
index 24e255fa259..3a8855b981e 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/fr/settings.po
@@ -1,86 +1,88 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# 
+#   <rom1dep@gmail.com>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
 "POT-Creation-Date: 2011-07-27 12:03+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"PO-Revision-Date: 2011-07-30 07:10+0000\n"
+"Last-Translator: rom1dep <rom1dep@gmail.com>\n"
+"Language-Team: French (http://www.transifex.net/projects/p/owncloud/team/fr/)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
 #: ../templates/index.php:3
 msgid "Account information"
-msgstr ""
+msgstr "Informations sur le compte"
 
 #: ../templates/index.php:5
 msgid "You're currently using"
-msgstr ""
+msgstr "Vous utilisez actuellement"
 
 #: ../templates/index.php:5
 msgid "of your"
-msgstr ""
+msgstr "de votre"
 
 #: ../templates/index.php:5
 msgid "space"
-msgstr ""
+msgstr "espace de stockage"
 
 #: ../templates/index.php:11
 msgid "Change Password"
-msgstr ""
+msgstr "Changer votre mot de passe"
 
 #: ../templates/index.php:12
 msgid "Your password got changed"
-msgstr ""
+msgstr "Votre mot de passe a été changé"
 
 #: ../templates/index.php:15
 msgid "Old password:"
-msgstr ""
+msgstr "Ancien mot de passe :"
 
 #: ../templates/index.php:19
 msgid "New password"
-msgstr ""
+msgstr "Nouveau mot de passe :"
 
 #: ../templates/index.php:24
 msgid "Show new password"
-msgstr ""
+msgstr "Afficher votre nouveau mot de passe"
 
 #: ../templates/index.php:34
 msgid "Language"
-msgstr ""
+msgstr "Langue"
 
 #: ../ajax/changepassword.php:13 ../ajax/setlanguage.php:13
 msgid "Authentication error"
-msgstr ""
+msgstr "Erreur d'authentification"
 
 #: ../ajax/changepassword.php:19
 msgid "You have to enter the old and the new password!"
-msgstr ""
+msgstr "Vous devez saisir l'ancien et le nouveau mot de passe !"
 
 #: ../ajax/changepassword.php:25
 msgid "Your old password is wrong!"
-msgstr ""
+msgstr "Votre ancien mot de passe est erroné !"
 
 #: ../ajax/changepassword.php:31
 msgid "Password changed"
-msgstr ""
+msgstr "Mot de passe changé avec succès"
 
 #: ../ajax/changepassword.php:34
 msgid "Unable to change password"
-msgstr ""
+msgstr "Impossible de changer le mot de passe"
 
 #: ../ajax/setlanguage.php:21
 msgid "Language changed"
-msgstr ""
+msgstr "Langue changée avec succès"
 
 #: ../ajax/setlanguage.php:23
 msgid "Invalid request"
-msgstr ""
+msgstr "Requète invalide"
+
+
diff --git a/l10n/nl/admin.po b/l10n/nl/admin.po
index 506d5906b8a..6c59b0b864e 100644
--- a/l10n/nl/admin.po
+++ b/l10n/nl/admin.po
@@ -1,21 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Robin Appelman <icewind1991@gmail.com>, 2011.
+# Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-20 22:00+0200\n"
-"PO-Revision-Date: 2011-06-21 15:00+0200\n"
-"Last-Translator: Robin Appelman <icewind1991@gmail.com>\n"
-"Language-Team: American English <kde-i18n-doc@kde.org>\n"
-"Language: \n"
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
+"POT-Creation-Date: 2011-07-27 12:03+0200\n"
+"PO-Revision-Date: 2011-07-28 00:09+0000\n"
+"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.2\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ../templates/app.php:22
 msgid "read more"
@@ -33,8 +34,8 @@ msgstr "Applicatiedatabase"
 msgid "Cannot connect to apps repository"
 msgstr "Kan geen verbinding maken met de applicatiedatabase"
 
-#: ../templates/apps.php:13 ../templates/users.php:6 ../templates/users.php:20
-#: ../templates/users.php:50
+#: ../templates/apps.php:13 ../templates/users.php:6 ../templates/users.php:15
+#: ../templates/users.php:51
 msgid "Name"
 msgstr "Naam"
 
@@ -50,43 +51,44 @@ msgstr "Administratie"
 msgid "System Settings"
 msgstr "Systeeminstellingen"
 
-#: ../templates/users.php:7 ../templates/users.php:46
+#: ../templates/users.php:2
+msgid "Users"
+msgstr "Gebruikers"
+
+#: ../templates/users.php:7 ../templates/users.php:47
 msgid "Groups"
 msgstr "Groepen"
 
-#: ../templates/users.php:13
-msgid "Add user"
-msgstr "Gebruiker toevoegen"
-
-#: ../templates/users.php:21
+#: ../templates/users.php:16
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: ../templates/users.php:30
-msgid "Create user"
-msgstr "Gebruiker aanmaken"
+#: ../templates/users.php:25
+msgid "Create"
+msgstr ""
 
-#: ../templates/users.php:40 ../templates/users.php:68
+#: ../templates/users.php:37 ../templates/users.php:69
 msgid "remove"
 msgstr "verwijder"
 
-#: ../templates/users.php:58
+#: ../templates/users.php:59
 msgid "Create group"
 msgstr "Groep aanmaken"
 
-#: ../templates/users.php:94
+#: ../templates/users.php:95
 msgid "Force new password:"
 msgstr "Forceer nieuw wachtwoord:"
 
-#: ../templates/users.php:96
+#: ../templates/users.php:97
 msgid "Set"
 msgstr "Ok"
 
-#: ../templates/users.php:102
+#: ../templates/users.php:103
 msgid "Do you really want to delete user"
 msgstr "Wilt u deze gebruiker verwijderen"
 
-#: ../templates/users.php:109
+#: ../templates/users.php:110
 msgid "Do you really want to delete group"
 msgstr "Wilt u deze groep verwijderen"
 
+
diff --git a/l10n/nl/core.po b/l10n/nl/core.po
index 3923dcb413d..dc797db0089 100644
--- a/l10n/nl/core.po
+++ b/l10n/nl/core.po
@@ -1,45 +1,44 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-20 22:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
+"POT-Creation-Date: 2011-07-27 12:03+0200\n"
+"PO-Revision-Date: 2011-07-28 00:33+0000\n"
+"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ../templates/404.php:15
 msgid "Error 404, Cloud not found"
 msgstr "Fout 404, Cloud niet gevonden."
 
 #: ../templates/installation.php:6
-msgid "Welcome to <strong>ownCloud</strong>, your personnal cloud."
-msgstr "Welkom by <strong>ownCloud</strong>, uw persoonlijke cloud"
+msgid "<strong>ownCloud</strong> is your personal web storage."
+msgstr ""
 
 #: ../templates/installation.php:7
-msgid "To finish the installation, please follow the steps below."
-msgstr "Volg de volgende stappen om de installatie te voltooien."
+msgid "Finish the setup by following the steps below."
+msgstr ""
 
 #: ../templates/installation.php:26
-msgid "Create an <strong>admin account.</strong>"
-msgstr "Maak een <strong>beheerdersaccount</strong> aan"
+msgid "Create an <strong>admin account</strong>."
+msgstr ""
 
 #: ../templates/installation.php:27
-msgid "Login:"
-msgstr "Gebruikersnaam:"
+msgid "Username"
+msgstr ""
 
 #: ../templates/installation.php:28
-msgid "Password:"
-msgstr "Wachtwoord:"
+msgid "Password"
+msgstr ""
 
 #: ../templates/installation.php:31
 msgid "Advanced"
@@ -54,49 +53,49 @@ msgid "Data directory:"
 msgstr "Gegevensmap:"
 
 #: ../templates/installation.php:39
-msgid "Configure your database."
-msgstr "Configureer uw database."
+msgid "Configure the database."
+msgstr ""
 
 #: ../templates/installation.php:43
-msgid "I will use a SQLite database. You have nothing to do!"
-msgstr "Er zal een SQLite database gebruikt worden. U hoeft geen verdere instellingen te maken."
+msgid "SQLite will be used for the database. You have nothing to do."
+msgstr ""
 
 #: ../templates/installation.php:46
 msgid "SQLite"
 msgstr "SQLite"
 
 #: ../templates/installation.php:53
-msgid "I will use a MySQL database."
-msgstr "Er zal een MySQL database gebruikt worden."
+msgid "MySQL will be used for the database."
+msgstr ""
 
 #: ../templates/installation.php:59
-msgid "Host:"
-msgstr "Host:"
+msgid "MySQL username:"
+msgstr ""
 
 #: ../templates/installation.php:60
-msgid "Database name:"
-msgstr "Databasenaam:"
+msgid "MySQL password:"
+msgstr ""
 
 #: ../templates/installation.php:61
-msgid "Table prefix:"
-msgstr "Voorvoegsel voor tabelnamen:"
+msgid "Database name:"
+msgstr "Databasenaam:"
 
 #: ../templates/installation.php:62
-msgid "MySQL user login:"
-msgstr "MySQL gebruikersnaam."
+msgid "Host:"
+msgstr "Host:"
 
 #: ../templates/installation.php:63
-msgid "MySQL user password:"
-msgstr "MySQL wachtwoord"
+msgid "Table prefix:"
+msgstr "Voorvoegsel voor tabelnamen:"
 
-#: ../templates/installation.php:68
+#: ../templates/installation.php:69
 msgid "Finish setup"
 msgstr "Installatie afronden"
 
-#: ../templates/layout.guest.php:20
+#: ../templates/layout.guest.php:33
 msgid ""
-"<a href=\"http://owncloud.org/\">ownCloud</a> is a personal cloud which runs "
-"on your own server.</p>"
+"<a href=\"http://owncloud.org/\">ownCloud</a> is a personal cloud which runs"
+" on your own server.</p>"
 msgstr ""
 "<a href=\"http://owncloud.org/\">ownCloud</a> is een persoonlijke cloud die "
 "op uw eigen server draait.</p>"
@@ -105,6 +104,10 @@ msgstr ""
 msgid "Login failed!"
 msgstr "Aanmelden mislukt."
 
+#: ../templates/login.php:11 ../templates/login.php:15
+msgid "Remember login"
+msgstr ""
+
 #: ../templates/logout.php:1
 msgid "You are logged out."
 msgstr "U bent afgemeld."
@@ -120,3 +123,5 @@ msgstr "volgende"
 #: ../templates/part.searchbox.php:3
 msgid "Search"
 msgstr "Zoeken"
+
+
diff --git a/l10n/nl/help.po b/l10n/nl/help.po
index b1f1f4bc447..7d8108c804d 100644
--- a/l10n/nl/help.po
+++ b/l10n/nl/help.po
@@ -1,27 +1,28 @@
+# SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Robin Appelman <icewind1991@gmail.com>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-20 22:00+0200\n"
-"PO-Revision-Date: 2011-06-21 15:03+0200\n"
-"Last-Translator: Robin Appelman <icewind1991@gmail.com>\n"
-"Language-Team: Dutch <>\n"
-"Language: \n"
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
+"POT-Creation-Date: 2011-07-27 12:03+0200\n"
+"PO-Revision-Date: 2011-07-25 16:18+0000\n"
+"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.2\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ../templates/index.php:2
 msgid "Questions and Answers"
 msgstr "Vraag en Antwoord"
 
-#: ../templates/index.php:21
+#: ../templates/index.php:24
 msgid "ASK A QUESTION"
 msgstr "Stel een vraag"
 
+
diff --git a/l10n/nl/log.po b/l10n/nl/log.po
index 3bf2f43a920..8d5f86c5b37 100644
--- a/l10n/nl/log.po
+++ b/l10n/nl/log.po
@@ -1,21 +1,21 @@
+# SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Robin Appelman <icewind1991@gmail.com>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-20 22:00+0200\n"
-"PO-Revision-Date: 2011-06-21 15:01+0200\n"
-"Last-Translator: Robin Appelman <icewind1991@gmail.com>\n"
-"Language-Team: American English <kde-i18n-doc@kde.org>\n"
-"Language: \n"
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
+"POT-Creation-Date: 2011-07-27 12:03+0200\n"
+"PO-Revision-Date: 2011-07-25 16:18+0000\n"
+"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.2\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ../templates/index.php:4
 msgid "Filter:"
@@ -65,3 +65,4 @@ msgstr "Wanneer"
 msgid "Clear log entries before"
 msgstr "Verwijder logboekitem ouder dan"
 
+
diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po
index 866e8b702cd..9a185102a2a 100644
--- a/l10n/nl/settings.po
+++ b/l10n/nl/settings.po
@@ -1,21 +1,20 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-20 22:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
+"POT-Creation-Date: 2011-07-27 12:03+0200\n"
+"PO-Revision-Date: 2011-07-25 16:18+0000\n"
+"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ../templates/index.php:3
 msgid "Account information"
@@ -84,3 +83,5 @@ msgstr "Taal aangepast"
 #: ../ajax/setlanguage.php:23
 msgid "Invalid request"
 msgstr "Ongeldig verzoek"
+
+
diff --git a/l10n/pl/admin.po b/l10n/pl/admin.po
index 858dccf6687..8efe13a268b 100644
--- a/l10n/pl/admin.po
+++ b/l10n/pl/admin.po
@@ -1,21 +1,21 @@
+# SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Kamil Domański <kdomanski@kdemail.net>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-21 16:19+0200\n"
-"PO-Revision-Date: 2011-06-22 03:28+0200\n"
-"Last-Translator: Kamil Domański <kdomanski@kdemail.net>\n"
-"Language-Team: American English <kde-i18n-doc@kde.org>\n"
-"Language: \n"
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
+"POT-Creation-Date: 2011-07-27 12:03+0200\n"
+"PO-Revision-Date: 2011-07-28 00:09+0000\n"
+"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.2\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 #: ../templates/app.php:22
 msgid "read more"
@@ -33,8 +33,8 @@ msgstr "Repozytorium aplikacji"
 msgid "Cannot connect to apps repository"
 msgstr "Nie można połączyć się z repozytorium aplikacji"
 
-#: ../templates/apps.php:13 ../templates/users.php:6 ../templates/users.php:20
-#: ../templates/users.php:50
+#: ../templates/apps.php:13 ../templates/users.php:6 ../templates/users.php:15
+#: ../templates/users.php:51
 msgid "Name"
 msgstr "Nazwa"
 
@@ -50,47 +50,44 @@ msgstr "Administracja"
 msgid "System Settings"
 msgstr "Ustawienia systemowe"
 
-#: ../templates/users.php:13
-msgid "Add user"
-msgstr "Dodaj użytkownika"
+#: ../templates/users.php:2
+msgid "Users"
+msgstr "Użytkownicy"
+
+#: ../templates/users.php:7 ../templates/users.php:47
+msgid "Groups"
+msgstr "Grupy"
 
-#: ../templates/users.php:21
+#: ../templates/users.php:16
 msgid "Password"
 msgstr "Hasło"
 
-#: ../templates/users.php:30
-msgid "Create user"
-msgstr "Utwórz użytkownika"
+#: ../templates/users.php:25
+msgid "Create"
+msgstr ""
 
-#: ../templates/users.php:40 ../templates/users.php:68
+#: ../templates/users.php:37 ../templates/users.php:69
 msgid "remove"
 msgstr "usuń"
 
-#: ../templates/users.php:46 ../templates/users.php:7
-msgid "Groups"
-msgstr "Grupy"
-
-#: ../templates/users.php:58
+#: ../templates/users.php:59
 msgid "Create group"
 msgstr "Utwórz grupę"
 
-#: ../templates/users.php:94
+#: ../templates/users.php:95
 msgid "Force new password:"
 msgstr "Wymuś nowe hasło"
 
-#: ../templates/users.php:96
+#: ../templates/users.php:97
 msgid "Set"
 msgstr "Ustaw"
 
-#: ../templates/users.php:102
+#: ../templates/users.php:103
 msgid "Do you really want to delete user"
 msgstr "Czy naprawdę chcesz usunąć użytkownika"
 
-#: ../templates/users.php:109
+#: ../templates/users.php:110
 msgid "Do you really want to delete group"
 msgstr "Czy naprawdę chcesz usunąć grupę"
 
-#: ../templates/users.php:1
-msgid "Users"
-msgstr "Użytkownicy"
 
diff --git a/l10n/pl/core.po b/l10n/pl/core.po
index 717555818e2..073bb8cd31d 100644
--- a/l10n/pl/core.po
+++ b/l10n/pl/core.po
@@ -1,45 +1,45 @@
+# SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Kamil Domański <kdomanski@kdemail.net>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-21 16:19+0200\n"
-"PO-Revision-Date: 2011-06-22 03:36+0200\n"
-"Last-Translator: Kamil Domański <kdomanski@kdemail.net>\n"
-"Language-Team: American English <kde-i18n-doc@kde.org>\n"
-"Language: \n"
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
+"POT-Creation-Date: 2011-07-27 12:03+0200\n"
+"PO-Revision-Date: 2011-07-28 00:33+0000\n"
+"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.2\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 #: ../templates/404.php:15
 msgid "Error 404, Cloud not found"
 msgstr "Błąd 404, Chmura nie znaleziona"
 
 #: ../templates/installation.php:6
-msgid "Welcome to <strong>ownCloud</strong>, your personnal cloud."
-msgstr "Witaj w <strong>ownCloud</strong>, Twojej osobistej chmurze."
+msgid "<strong>ownCloud</strong> is your personal web storage."
+msgstr ""
 
 #: ../templates/installation.php:7
-msgid "To finish the installation, please follow the steps below."
-msgstr "By zakończyć instalację, podążaj poniższymi krokami."
+msgid "Finish the setup by following the steps below."
+msgstr ""
 
 #: ../templates/installation.php:26
-msgid "Create an <strong>admin account.</strong>"
-msgstr "Utwórz <strong>konto administratora</strong>."
+msgid "Create an <strong>admin account</strong>."
+msgstr ""
 
 #: ../templates/installation.php:27
-msgid "Login:"
-msgstr "Login:"
+msgid "Username"
+msgstr ""
 
 #: ../templates/installation.php:28
-msgid "Password:"
-msgstr "Hasło:"
+msgid "Password"
+msgstr ""
 
 #: ../templates/installation.php:31
 msgid "Advanced"
@@ -54,57 +54,61 @@ msgid "Data directory:"
 msgstr "Katalog danych:"
 
 #: ../templates/installation.php:39
-msgid "Configure your database."
-msgstr "Skonfiguruj Twoją bazę danych."
+msgid "Configure the database."
+msgstr ""
 
 #: ../templates/installation.php:43
-msgid "I will use a SQLite database. You have nothing to do!"
-msgstr "Użyję bazy SQLite. Nie masz tu nic do roboty!"
+msgid "SQLite will be used for the database. You have nothing to do."
+msgstr ""
 
 #: ../templates/installation.php:46
 msgid "SQLite"
 msgstr "SQLite"
 
 #: ../templates/installation.php:53
-msgid "I will use a MySQL database."
-msgstr "Użyję bazy danych MySQL."
+msgid "MySQL will be used for the database."
+msgstr ""
 
 #: ../templates/installation.php:59
-msgid "Host:"
-msgstr "Host:"
+msgid "MySQL username:"
+msgstr ""
 
 #: ../templates/installation.php:60
-msgid "Database name:"
-msgstr "Nazwa bazy:"
+msgid "MySQL password:"
+msgstr ""
 
 #: ../templates/installation.php:61
-msgid "Table prefix:"
-msgstr "Przedrostek tabeli:"
+msgid "Database name:"
+msgstr "Nazwa bazy:"
 
 #: ../templates/installation.php:62
-msgid "MySQL user login:"
-msgstr "Login użytkownika MySQL:"
+msgid "Host:"
+msgstr "Host:"
 
 #: ../templates/installation.php:63
-msgid "MySQL user password:"
-msgstr "Hasło użytkownika MySQL:"
+msgid "Table prefix:"
+msgstr "Przedrostek tabeli:"
 
-#: ../templates/installation.php:68
+#: ../templates/installation.php:69
 msgid "Finish setup"
 msgstr "Zakończ instalację"
 
-#: ../templates/layout.guest.php:20
+#: ../templates/layout.guest.php:33
 msgid ""
-"<a href=\"http://owncloud.org/\">ownCloud</a> is a personal cloud which runs "
-"on your own server.</p>"
+"<a href=\"http://owncloud.org/\">ownCloud</a> is a personal cloud which runs"
+" on your own server.</p>"
 msgstr ""
-"<a href=\"http://owncloud.org/\">ownCloud</a> jest osobistą chmurą działającą "
-"na Twoim własnym serwerze.</p>"
+"<a href=\"http://owncloud.org/\">ownCloud</a> jest osobistą chmurą "
+"działającą na Twoim własnym serwerze.</p>"
 
 #: ../templates/login.php:6
 msgid "Login failed!"
 msgstr "Nie udało się zalogować!"
 
+#: ../templates/login.php:11 ../templates/login.php:15
+msgid "Remember login"
+msgstr ""
+
 #: ../templates/logout.php:1
 msgid "You are logged out."
 msgstr "Jesteś wylogowany."
@@ -121,3 +125,4 @@ msgstr "dalej"
 msgid "Search"
 msgstr "Szukaj"
 
+
diff --git a/l10n/pl/help.po b/l10n/pl/help.po
index a9d8481d5ce..a4390c8bdad 100644
--- a/l10n/pl/help.po
+++ b/l10n/pl/help.po
@@ -1,28 +1,28 @@
+# SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Kamil Domański <kdomanski@kdemail.net>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-21 16:19+0200\n"
-"PO-Revision-Date: 2011-06-22 03:45+0200\n"
-"Last-Translator: Kamil Domański <kdomanski@kdemail.net>\n"
-"Language-Team: Polish <owncloud@kde.org>\n"
-"Language: \n"
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
+"POT-Creation-Date: 2011-07-27 12:03+0200\n"
+"PO-Revision-Date: 2011-07-25 16:16+0000\n"
+"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.2\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2);\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 #: ../templates/index.php:2
 msgid "Questions and Answers"
 msgstr "Pytania i odpowiedzi"
 
-#: ../templates/index.php:21
+#: ../templates/index.php:24
 msgid "ASK A QUESTION"
 msgstr "ZADAJ PYTANIE"
 
+
diff --git a/l10n/pl/log.po b/l10n/pl/log.po
index 9c426ec2318..5afe1b6f4c3 100644
--- a/l10n/pl/log.po
+++ b/l10n/pl/log.po
@@ -1,22 +1,21 @@
+# SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Kamil Domański <kdomanski@kdemail.net>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-21 16:19+0200\n"
-"PO-Revision-Date: 2011-06-22 03:50+0200\n"
-"Last-Translator: Kamil Domański <kdomanski@kdemail.net>\n"
-"Language-Team: Polish <owncloud@kde.org>\n"
-"Language: \n"
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
+"POT-Creation-Date: 2011-07-27 12:03+0200\n"
+"PO-Revision-Date: 2011-07-25 16:16+0000\n"
+"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.2\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2);\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 #: ../templates/index.php:4
 msgid "Filter:"
@@ -66,3 +65,4 @@ msgstr "Kiedy"
 msgid "Clear log entries before"
 msgstr "Wyczyść spisy dziennika sprzed"
 
+
diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po
index 6dec38f1054..99ae9c3ff08 100644
--- a/l10n/pl/settings.po
+++ b/l10n/pl/settings.po
@@ -1,22 +1,21 @@
+# SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Kamil Domański <kdomanski@kdemail.net>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-21 16:19+0200\n"
-"PO-Revision-Date: 2011-06-22 03:52+0200\n"
-"Last-Translator: Kamil Domański <kdomanski@kdemail.net>\n"
-"Language-Team: Polish <owncloud@kde.org>\n"
-"Language: \n"
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
+"POT-Creation-Date: 2011-07-27 12:03+0200\n"
+"PO-Revision-Date: 2011-07-25 16:16+0000\n"
+"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.2\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2);\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 #: ../templates/index.php:3
 msgid "Account information"
@@ -86,3 +85,4 @@ msgstr "Język zmieniony"
 msgid "Invalid request"
 msgstr "Nieprawidłowe żądanie"
 
+
diff --git a/l10n/templates/help.pot b/l10n/templates/help.pot
deleted file mode 100644
index e5ffb5a4cf5..00000000000
--- a/l10n/templates/help.pot
+++ /dev/null
@@ -1,26 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-27 12:03+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ../templates/index.php:2
-msgid "Questions and Answers"
-msgstr ""
-
-#: ../templates/index.php:24
-msgid "ASK A QUESTION"
-msgstr ""
diff --git a/lib/MDB2/Driver/Manager/sqlite3.php b/lib/MDB2/Driver/Manager/sqlite3.php
index 7096126a523..4e420b5d0b2 100644
--- a/lib/MDB2/Driver/Manager/sqlite3.php
+++ b/lib/MDB2/Driver/Manager/sqlite3.php
@@ -70,7 +70,7 @@ class MDB2_Driver_Manager_sqlite3 extends MDB2_Driver_Manager_Common
     function createDatabase($name, $options = array())
     {
 		global $SERVERROOT;
-		$datadir=OC_CONFIG::getValue( "datadirectory", "$SERVERROOT/data" );
+		$datadir=OC_Config::getValue( "datadirectory", "$SERVERROOT/data" );
         $db =$this->getDBInstance();
         if (PEAR::isError($db)) {
             return $db;
diff --git a/lib/MDB2/Driver/sqlite3.php b/lib/MDB2/Driver/sqlite3.php
index 3b74afed146..ccf6bb53688 100644
--- a/lib/MDB2/Driver/sqlite3.php
+++ b/lib/MDB2/Driver/sqlite3.php
@@ -352,7 +352,7 @@ class MDB2_Driver_sqlite3 extends MDB2_Driver_Common
 			return MDB2_OK;
 		}
 		global $SERVERROOT;
-		$datadir=OC_CONFIG::getValue( "datadirectory", "$SERVERROOT/data" );
+		$datadir=OC_Config::getValue( "datadirectory", "$SERVERROOT/data" );
         $database_file = $this->_getDatabaseFile($this->database_name);
         if (is_resource($this->connection)) {
             //if (count(array_diff($this->connected_dsn, $this->dsn)) == 0
diff --git a/lib/app.php b/lib/app.php
index b6c2512e79a..9e81ed8184e 100644
--- a/lib/app.php
+++ b/lib/app.php
@@ -26,7 +26,7 @@
  * owncloud ecosystem. Furthermore, this class is responsible for installing,
  * upgrading and removing apps.
  */
-class OC_APP{
+class OC_App{
 	static private $init = false;
 	static private $apps = array();
 	static private $activeapp = '';
@@ -57,7 +57,7 @@ class OC_APP{
 		}
 
 		// The rest comes here
-		$apps = OC_APPCONFIG::getApps();
+		$apps = OC_Appconfig::getApps();
 		foreach( $apps as $app ){
 			if( self::isEnabled( $app )){
 				if(is_file($SERVERROOT.'/apps/'.$app.'/appinfo/app.php')){
@@ -80,7 +80,7 @@ class OC_APP{
 	 * This function checks whether or not an app is enabled.
 	 */
 	public static function isEnabled( $app ){
-		if( 'yes' == OC_APPCONFIG::getValue( $app, 'enabled' )){
+		if( 'yes' == OC_Appconfig::getValue( $app, 'enabled' )){
 			return true;
 		}
 
@@ -95,7 +95,7 @@ class OC_APP{
 	 * This function set an app as enabled in appconfig.
 	 */
 	public static function enable( $app ){
-		OC_APPCONFIG::setValue( $app, 'enabled', 'yes' );
+		OC_Appconfig::setValue( $app, 'enabled', 'yes' );
 	}
 
 	/**
@@ -106,7 +106,7 @@ class OC_APP{
 	 * This function set an app as enabled in appconfig.
 	 */
 	public static function disable( $app ){
-		OC_APPCONFIG::setValue( $app, 'enabled', 'no' );
+		OC_Appconfig::setValue( $app, 'enabled', 'no' );
 	}
 
 	/**
@@ -126,7 +126,7 @@ class OC_APP{
 	 *
 	 */
 	public static function register( $data ){
-		OC_APP::$apps[] = $data;
+		OC_App::$apps[] = $data;
 	}
 
 	/**
@@ -137,7 +137,7 @@ class OC_APP{
 	 */
 	public static function get(){
 		// TODO: write function
-		return OC_APP::$apps;
+		return OC_App::$apps;
 	}
 
 	/**
@@ -162,7 +162,7 @@ class OC_APP{
 		if(!isset($data['icon'])){
 			$data['icon']='';
 		}
-		OC_APP::$navigation[] = $data;
+		OC_App::$navigation[] = $data;
 		return true;
 	}
 
@@ -241,7 +241,7 @@ class OC_APP{
 	 */
 	public static function addAdminPage( $data = array()){
 		// TODO: write function
-		OC_APP::$adminpages[] = $data;
+		OC_App::$adminpages[] = $data;
 		return true;
 	}
 
@@ -266,7 +266,7 @@ class OC_APP{
 	 */
 	public static function addSettingsPage( $data = array()){
 		// TODO: write function
-		OC_APP::$settingspages[] = $data;
+		OC_App::$settingspages[] = $data;
 		return true;
 	}
 
@@ -408,4 +408,3 @@ class OC_APP{
 		}
 	}
 }
-?>
\ No newline at end of file
diff --git a/lib/appconfig.php b/lib/appconfig.php
index 4fef7542f40..06281d38585 100644
--- a/lib/appconfig.php
+++ b/lib/appconfig.php
@@ -37,7 +37,7 @@
  * This class provides an easy way for apps to store config values in the
  * database.
  */
-class OC_APPCONFIG{
+class OC_Appconfig{
 	/**
 	 * @brief Get all apps using the config
 	 * @returns array with app ids
@@ -158,4 +158,3 @@ class OC_APPCONFIG{
 		return true;
 	}
 }
-?>
diff --git a/lib/base.php b/lib/base.php
index d81479e5a28..324713de61c 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -20,6 +20,13 @@
  *
  */
 
+// Get rid of this stupid require_once OC_...
+function OC_autoload($className) {
+	if(strpos($className,'OC_')===0) {
+		require_once strtolower(str_replace('_','/',substr($className,3)) . '.php');
+	}
+}
+spl_autoload_register('OC_autoload');
 
 // set some stuff
 //ob_start();
@@ -36,8 +43,8 @@ $DOCUMENTROOT=realpath($_SERVER['DOCUMENT_ROOT']);
 $SERVERROOT=str_replace("\\",'/',$SERVERROOT);
 $SUBURI=substr(realpath($_SERVER["SCRIPT_FILENAME"]),strlen($SERVERROOT));
 $scriptName=$_SERVER["SCRIPT_NAME"];
-if(substr($scriptName,-1)=='/'){//if the script isn't a file assume index.php
-  $scriptName.='index.php';
+if(substr($scriptName,-1)=='/'){
+	$scriptName.='index.php';
 }
 $WEBROOT=substr($scriptName,0,strlen($scriptName)-strlen($SUBURI));
 
@@ -58,17 +65,14 @@ if( !isset( $RUNTIME_NOAPPS )){
 	$RUNTIME_NOAPPS = false;
 }
 
-// Doing the config stuff first
-require_once('config.php');
-
 // TODO: we should get rid of this one, too
 // WARNING: to make everything even more confusing, DATADIRECTORY is a var that
 //   changes and DATATIRECTORY_ROOT stays the same, but is set by
 //   "datadirectory". Any questions?
-$CONFIG_DATADIRECTORY = OC_CONFIG::getValue( "datadirectory", "$SERVERROOT/data" );
+$CONFIG_DATADIRECTORY = OC_Config::getValue( "datadirectory", "$SERVERROOT/data" );
 
 // redirect to https site if configured
-if( OC_CONFIG::getValue( "forcessl", false )){
+if( OC_Config::getValue( "forcessl", false )){
 	if(!isset($_SERVER['HTTPS']) or $_SERVER['HTTPS'] != 'on') {
 		$url = "https://". $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI'];
 		header("Location: $url");
@@ -76,359 +80,124 @@ if( OC_CONFIG::getValue( "forcessl", false )){
 	}
 }
 
-// load core libs
-require_once('helper.php');
-require_once('database.php');
-require_once('app.php');
-require_once('appconfig.php');
-require_once('files.php');
-require_once('filesystem.php');
-require_once('filestorage.php');
-require_once('apps/files_sharing/sharedstorage.php');
-require_once('l10n.php');
-require_once('preferences.php');
-require_once('log.php');
-require_once('user.php');
-require_once('group.php');
-require_once('ocs.php');
-require_once('ocsclient.php');
-require_once('connect.php');
-require_once('remotestorage.php');
-require_once('search.php');
+$error=(count(OC_Util::checkServer())>0);
+
+// User and Groups
+if( !OC_Config::getValue( "installed", false )){
+	$_SESSION['user_id'] = '';
+}
 
-$error=(count(OC_UTIL::checkServer())>0);
+OC_User::useBackend( OC_Config::getValue( "userbackend", "database" ));
+OC_Group::setBackend( OC_Config::getValue( "groupbackend", "database" ));
 
-OC_USER::useBackend( OC_CONFIG::getValue( "userbackend", "database" ));
-OC_GROUP::setBackend( OC_CONFIG::getValue( "groupbackend", "database" ));
+// Was in required file ... put it here
+OC_Filesystem::registerStorageType('local','OC_Filestorage_Local',array('datadir'=>'string'));
+require_once('apps/files_sharing/sharedstorage.php');
+OC_Filesystem::registerStorageType('shared','OC_Filestorage_Shared',array('datadir'=>'string'));
 
 // Set up file system unless forbidden
 if(!$error and !$RUNTIME_NOSETUPFS ){
-	OC_UTIL::setupFS();
+	OC_Util::setupFS();
 }
 
 // Add the stuff we need always
-OC_UTIL::addScript( "jquery-1.6.2.min" );
-OC_UTIL::addScript( "jquery-ui-1.8.14.custom.min" );
-OC_UTIL::addScript( "js" );
-OC_UTIL::addStyle( "jquery-ui-1.8.14.custom" );
-OC_UTIL::addStyle( "styles" );
+OC_Util::addScript( "jquery-1.6.2.min" );
+OC_Util::addScript( "jquery-ui-1.8.14.custom.min" );
+OC_Util::addScript( "js" );
+OC_Util::addStyle( "jquery-ui-1.8.14.custom" );
+OC_Util::addStyle( "styles" );
 
 // Load Apps
 if(!$error and !$RUNTIME_NOAPPS ){
-	OC_APP::loadApps();
+	OC_App::loadApps();
 }
 
-/**
- * Class for utility functions
- *
- */
-class OC_UTIL {
-	public static $scripts=array();
-	public static $styles=array();
-	public static $headers=array();
-	private static $fsSetup=false;
-
-	// Can be set up
-	public static function setupFS( $user = "", $root = "files" ){// configure the initial filesystem based on the configuration
-		if(self::$fsSetup){//setting up the filesystem twice can only lead to trouble
-			return false;
-		}
-
-		// Global Variables
-		global $SERVERROOT;
-		global $CONFIG_DATADIRECTORY;
-
-		$CONFIG_DATADIRECTORY_ROOT = OC_CONFIG::getValue( "datadirectory", "$SERVERROOT/data" );
-		$CONFIG_BACKUPDIRECTORY = OC_CONFIG::getValue( "backupdirectory", "$SERVERROOT/backup" );
-
-		// Create root dir
-		if(!is_dir($CONFIG_DATADIRECTORY_ROOT)){
-			@mkdir($CONFIG_DATADIRECTORY_ROOT) or die("Can't create data directory ($CONFIG_DATADIRECTORY_ROOT), you can usually fix this by setting the owner of '$SERVERROOT' to the user that the web server uses (www-data for debian/ubuntu)");
-		}
-
-		// If we are not forced to load a specific user we load the one that is logged in
-		if( $user == "" && OC_USER::isLoggedIn()){
-			$user = OC_USER::getUser();
-		}
-
-		if( $user != "" ){ //if we aren't logged in, there is no use to set up the filesystem
-			//first set up the local "root" storage and the backupstorage if needed
-			$rootStorage=OC_FILESYSTEM::createStorage('local',array('datadir'=>$CONFIG_DATADIRECTORY_ROOT));
-// 			if( OC_CONFIG::getValue( "enablebackup", false )){
-// 				// This creates the Directorys recursively
-// 				if(!is_dir( "$CONFIG_BACKUPDIRECTORY/$user/$root" )){
-// 					mkdir( "$CONFIG_BACKUPDIRECTORY/$user/$root", 0755, true );
-// 				}
-// 				$backupStorage=OC_FILESYSTEM::createStorage('local',array('datadir'=>$CONFIG_BACKUPDIRECTORY));
-// 				$backup=new OC_FILEOBSERVER_BACKUP(array('storage'=>$backupStorage));
-// 				$rootStorage->addObserver($backup);
-// 			}
-			OC_FILESYSTEM::mount($rootStorage,'/');
-
-			// TODO add this storage provider in a proper way
-			$sharedStorage = OC_FILESYSTEM::createStorage('shared',array('datadir'=>'/'.OC_USER::getUser().'/files/Share/'));
-			OC_FILESYSTEM::mount($sharedStorage,'/'.OC_USER::getUser().'/files/Share/');
-			
-			$CONFIG_DATADIRECTORY = "$CONFIG_DATADIRECTORY_ROOT/$user/$root";
-			if( !is_dir( $CONFIG_DATADIRECTORY )){
-				mkdir( $CONFIG_DATADIRECTORY, 0755, true );
-			}
-
-// TODO: find a cool way for doing this
-// 			//set up the other storages according to the system settings
-// 			foreach($CONFIG_FILESYSTEM as $storageConfig){
-// 				if(OC_FILESYSTEM::hasStorageType($storageConfig['type'])){
-// 					$arguments=$storageConfig;
-// 					unset($arguments['type']);
-// 					unset($arguments['mountpoint']);
-// 					$storage=OC_FILESYSTEM::createStorage($storageConfig['type'],$arguments);
-// 					if($storage){
-// 						OC_FILESYSTEM::mount($storage,$storageConfig['mountpoint']);
-// 					}
-// 				}
-// 			}
-
-			//jail the user into his "home" directory
-			OC_FILESYSTEM::chroot("/$user/$root");
-			self::$fsSetup=true;
-		}
-	}
-
-	public static function tearDownFS(){
-		OC_FILESYSTEM::tearDown();
-		self::$fsSetup=false;
-	}
-
-	/**
-	 * get the current installed version of ownCloud
-	 * @return array
-	 */
-	public static function getVersion(){
-		return array(1,90,0);
-	}
-
-	/**
-	 * add a javascript file
-	 *
-	 * @param url  $url
-	 */
-	public static function addScript( $application, $file = null ){
-		if( is_null( $file )){
-			$file = $application;
-			$application = "";
-		}
-		if( !empty( $application )){
-			self::$scripts[] = "$application/js/$file";
-		}else{
-			self::$scripts[] = "js/$file";
-		}
-	}
-
-	/**
-	 * add a css file
-	 *
-	 * @param url  $url
-	 */
-	public static function addStyle( $application, $file = null ){
-		if( is_null( $file )){
-			$file = $application;
-			$application = "";
-		}
-		if( !empty( $application )){
-			self::$styles[] = "$application/css/$file";
-		}else{
-			self::$styles[] = "css/$file";
-		}
-	}
-
-	/**
-	 * @brief Add a custom element to the header
-	 * @param string tag tag name of the element
-	 * @param array $attributes array of attrobutes for the element
-	 * @param string $text the text content for the element
-	 */
-	public static function addHeader( $tag, $attributes, $text=''){
-		self::$headers[]=array('tag'=>$tag,'attributes'=>$attributes,'text'=>$text);
-	}
-
-       /**
-         * formats a timestamp in the "right" way
-         *
-         * @param int timestamp $timestamp
-         * @param bool dateOnly option to ommit time from the result
-         */
-        public static function formatDate( $timestamp,$dateOnly=false){
-			if(isset($_SESSION['timezone'])){//adjust to clients timezone if we know it
-				$systemTimeZone = intval(exec('date +%z'));
-				$systemTimeZone=(round($systemTimeZone/100,0)*60)+($systemTimeZone%100);
-				$clientTimeZone=$_SESSION['timezone']*60;
-				$offset=$clientTimeZone-$systemTimeZone;
-				$timestamp=$timestamp+$offset*60;
-			}
-			$timeformat=$dateOnly?'F j, Y':'F j, Y, H:i';
-			return date($timeformat,$timestamp);
-        }
-
-	/**
-	 * Shows a pagenavi widget where you can jump to different pages.
-	 *
-	 * @param int $pagecount
-	 * @param int $page
-	 * @param string $url
-	 * @return OC_TEMPLATE
-	 */
-	public static function getPageNavi($pagecount,$page,$url) {
-
-		$pagelinkcount=8;
-		if ($pagecount>1) {
-			$pagestart=$page-$pagelinkcount;
-			if($pagestart<0) $pagestart=0;
-			$pagestop=$page+$pagelinkcount;
-			if($pagestop>$pagecount) $pagestop=$pagecount;
-			
-			$tmpl = new OC_TEMPLATE( '', 'part.pagenavi', '' );
-			$tmpl->assign('page',$page);
-			$tmpl->assign('pagecount',$pagecount);
-			$tmpl->assign('pagestart',$pagestart);
-			$tmpl->assign('pagestop',$pagestop);
-			$tmpl->assign('url',$url);
-			return $tmpl;
-		}
-	}
-
-
-
-	/**
-	 * check if the current server configuration is suitable for ownCloud
-	 * @return array arrays with error messages and hints
-	 */
-	public static function checkServer(){
-		global $SERVERROOT;
-		global $CONFIG_DATADIRECTORY;
-
-		$CONFIG_DATADIRECTORY_ROOT = OC_CONFIG::getValue( "datadirectory", "$SERVERROOT/data" );;
-		$CONFIG_BACKUPDIRECTORY = OC_CONFIG::getValue( "backupdirectory", "$SERVERROOT/backup" );
-		$CONFIG_INSTALLED = OC_CONFIG::getValue( "installed", false );
-		$errors=array();
-
-		//check for database drivers
-		if(!is_callable('sqlite_open') and !is_callable('mysql_connect')){
-			$errors[]=array('error'=>'No database drivers (sqlite or mysql) installed.<br/>','hint'=>'');//TODO: sane hint
-		}
-		$CONFIG_DBTYPE = OC_CONFIG::getValue( "dbtype", "sqlite" );
-		$CONFIG_DBNAME = OC_CONFIG::getValue( "dbname", "owncloud" );
-		
-		//try to get the username the httpd server runs on, used in hints
-		$stat=stat($_SERVER['DOCUMENT_ROOT']);
-		if(is_callable('posix_getpwuid')){
-			$serverUser=posix_getpwuid($stat['uid']);
-			$serverUser='\''.$serverUser['name'].'\'';
-		}else{
-			$serverUser='\'www-data\' for ubuntu/debian';//TODO: try to detect the distro and give a guess based on that
-		}
-		
-		//common hint for all file permissons error messages
-		$permissionsHint="Permissions can usually be fixed by setting the owner of the file or directory to the user the web server runs as ($serverUser)";
-		
-		//check for correct file permissions
-		if(!stristr(PHP_OS, 'WIN')){
-			$prems=substr(decoct(fileperms($CONFIG_DATADIRECTORY_ROOT)),-3);
-			if(substr($prems,-1)!='0'){
-				OC_HELPER::chmodr($CONFIG_DATADIRECTORY_ROOT,0770);
-				clearstatcache();
-				$prems=substr(decoct(fileperms($CONFIG_DATADIRECTORY_ROOT)),-3);
-				if(substr($prems,2,1)!='0'){
-					$errors[]=array('error'=>'Data directory ('.$CONFIG_DATADIRECTORY_ROOT.') is readable from the web<br/>','hint'=>$permissionsHint);
+// FROM Connect.php
+function OC_CONNECT_TEST($path,$user,$password){
+	echo 'connecting...';
+	$remote=OC_Connect::connect($path,$user,$password);
+	if($remote->connected){
+		echo 'done<br/>';
+		if($remote->isLoggedIn()){
+			echo 'logged in, session working<br/>';
+			echo 'trying to get remote files...';
+			$files=$remote->getFiles('');
+			if($files){
+				echo count($files).' files found:<br/>';
+				foreach($files as $file){
+					echo "{$file['type']} {$file['name']}: {$file['size']} bytes<br/>";
 				}
-			}
-			if( OC_CONFIG::getValue( "enablebackup", false )){
-				$prems=substr(decoct(fileperms($CONFIG_BACKUPDIRECTORY)),-3);
-				if(substr($prems,-1)!='0'){
-					OC_HELPER::chmodr($CONFIG_BACKUPDIRECTORY,0770);
-					clearstatcache();
-					$prems=substr(decoct(fileperms($CONFIG_BACKUPDIRECTORY)),-3);
-					if(substr($prems,2,1)!='0'){
-						$errors[]=array('error'=>'Data directory ('.$CONFIG_BACKUPDIRECTORY.') is readable from the web<br/>','hint'=>$permissionsHint);
+				echo 'getting file "'.$file['name'].'"...';
+				$size=$file['size'];
+				$file=$remote->getFile('',$file['name']);
+				if(file_exists($file)){
+					$newSize=filesize($file);
+					if($size!=$newSize){
+						echo "fail<br/>Error: $newSize bytes received, $size expected.";
+						echo '<br/><br/>Recieved file:<br/>';
+						readfile($file);
+						unlink($file);
+						return;
 					}
+					OC_Filesystem::fromTmpFile($file,'/remoteFile');
+					echo 'done<br/>';
+					echo 'sending file "burning_avatar.png"...';
+					$res=$remote->sendFile('','burning_avatar.png','','burning_avatar.png');
+					if($res){
+						echo 'done<br/>';
+					}else{
+						echo 'fail<br/>';
+					}
+				}else{
+					echo 'fail<br/>';
 				}
+			}else{
+				echo 'fail<br/>';
 			}
 		}else{
-			//TODO: premisions checks for windows hosts
-		}
-		if(is_dir($CONFIG_DATADIRECTORY_ROOT) and !is_writable($CONFIG_DATADIRECTORY_ROOT)){
-			$errors[]=array('error'=>'Data directory ('.$CONFIG_DATADIRECTORY_ROOT.') not writable by ownCloud<br/>','hint'=>$permissionsHint);
+			echo 'no longer logged in, session fail<br/>';
 		}
-
-		//TODO: check for php modules
-
-		return $errors;
+	}else{
+		echo 'fail<br/>';
 	}
+	$remote->disconnect();
+	die();
 }
 
-/**
- * This class manages the hooks. It basically provides two functions: adding
- * slots and emitting signals.
- */
-class OC_HOOK{
-	static private $registered = array();
-
-	/**
-	 * @brief connects a function to a hook
-	 * @param $signalclass class name of emitter
-	 * @param $signalname name of signal
-	 * @param $slotclass class name of slot
-	 * @param $slotname name of slot
-	 * @returns true/false
-	 *
-	 * This function makes it very easy to connect to use hooks.
-	 *
-	 * TODO: write example
-	 */
-	static public function connect( $signalclass, $signalname, $slotclass, $slotname ){
-		// Cerate the data structure
-		if( !array_key_exists( $signalclass, self::$registered )){
-			self::$registered[$signalclass] = array();
-		}
-		if( !array_key_exists( $signalname, self::$registered[$signalclass] )){
-			self::$registered[$signalclass][$signalname] = array();
-		}
-
-		// register hook
-		self::$registered[$signalclass][$signalname][] = array(
-		  "class" => $slotclass,
-		  "name" => $slotname );
-
-		// No chance for failure ;-)
-		return true;
-	}
+// From files.php
+function zipAddDir($dir,$zip,$internalDir=''){
+    $dirname=basename($dir);
+    $zip->addEmptyDir($internalDir.$dirname);
+    $internalDir.=$dirname.='/';
+    $files=OC_Files::getdirectorycontent($dir);
+    foreach($files as $file){
+        $filename=$file['name'];
+        $file=$dir.'/'.$filename;
+        if(OC_Filesystem::is_file($file)){
+			$tmpFile=OC_Filesystem::toTmpFile($file);
+			OC_Files::$tmpFiles[]=$tmpFile;
+            $zip->addFile($tmpFile,$internalDir.$filename);
+        }elseif(OC_Filesystem::is_dir($file)){
+            zipAddDir($file,$zip,$internalDir);
+        }
+    }
+}
 
-	/**
-	 * @brief emitts a signal
-	 * @param $signalclass class name of emitter
-	 * @param $signalname name of signal
-	 * @param $params defautl: array() array with additional data
-	 * @returns true if slots exists or false if not
-	 *
-	 * Emits a signal. To get data from the slot use references!
-	 *
-	 * TODO: write example
-	 */
-	static public function emit( $signalclass, $signalname, $params = array()){
-		// Return false if there are no slots
-		if( !array_key_exists( $signalclass, self::$registered )){
-			return false;
-		}
-		if( !array_key_exists( $signalname, self::$registered[$signalclass] )){
-			return false;
-		}
+if(!function_exists('sys_get_temp_dir')) {
+    function sys_get_temp_dir() {
+        if( $temp=getenv('TMP') )        return $temp;
+        if( $temp=getenv('TEMP') )        return $temp;
+        if( $temp=getenv('TMPDIR') )    return $temp;
+        $temp=tempnam(__FILE__,'');
+        if (file_exists($temp)) {
+          unlink($temp);
+          return dirname($temp);
+        }
+        return null;
+    }
+}
 
-		// Call all slots
-		foreach( self::$registered[$signalclass][$signalname] as $i ){
-			call_user_func( array( $i["class"], $i["name"] ), $params );
-		}
+require_once('fakedirstream.php');
 
-		// return true
-		return true;
-	}
-}
-?>
+// FROM search.php
+new OC_Search_Provider_File();
\ No newline at end of file
diff --git a/lib/config.php b/lib/config.php
index cd18ddd499c..16e9ea441d5 100644
--- a/lib/config.php
+++ b/lib/config.php
@@ -38,7 +38,7 @@
  * This class is responsible for reading and writing config.php, the very basic
  * configuration file of owncloud.
  */
-class OC_CONFIG{
+class OC_Config{
 	// associative array key => value
 	private static $cache = array();
 
@@ -182,4 +182,3 @@ class OC_CONFIG{
 		return true;
 	}
 }
-?>
diff --git a/lib/connect.php b/lib/connect.php
index 6fc8f2165cf..22e48750a62 100644
--- a/lib/connect.php
+++ b/lib/connect.php
@@ -25,7 +25,7 @@
  * Class for connecting multiply ownCloud installations
  *
  */
-class OC_CONNECT{
+class OC_Connect{
 	static private $clouds=array();
 
 	static function connect($path,$user,$password){
@@ -38,263 +38,3 @@ class OC_CONNECT{
 		}
 	}
 }
-
-
-/**
- * Class for connection to a remote owncloud installation
- *
- */
-class OC_REMOTE_CLOUD{
-	private $path;
-	private $connected=false;
-	private $cookiefile=false;
-
-	/**
-	* make an api call to the remote cloud
-	* @param string $action
-	* @param array parameters
-	* @param bool assoc   when set to true, the result will be parsed as associative array
-	*
-	*/
-	private function apiCall($action,$parameters=false,$assoc=false){
-		if(!$this->cookiefile){
-			$this->cookiefile=sys_get_temp_dir().'/remoteCloudCookie'.uniqid();
-		}
-		$url=$this->path.='/files/api.php';
-		$fields_string="action=$action&";
-		if(is_array($parameters)){
-			foreach($parameters as $key=>$value){
-				$fields_string.=$key.'='.$value.'&';
-			}
-			rtrim($fields_string,'&');
-		}
-		$ch=curl_init();
-		curl_setopt($ch,CURLOPT_URL,$url);
-		curl_setopt($ch,CURLOPT_POST,count($parameters));
-		curl_setopt($ch,CURLOPT_POSTFIELDS,$fields_string);
-		curl_setopt($ch, CURLOPT_COOKIEFILE,$this->cookiefile);
-		curl_setopt($ch, CURLOPT_COOKIEJAR,$this->cookiefile);
-		curl_setopt($ch,CURLOPT_RETURNTRANSFER,true);
-		$result=curl_exec($ch);
-		$result=trim($result);
-		$info=curl_getinfo($ch);
-		$httpCode=$info['http_code'];
-		curl_close($ch);
-		if($httpCode==200 or $httpCode==0){
-			return json_decode($result,$assoc);
-		}else{
-			return false;
-		}
-	}
-
-	public function __construct($path,$user,$password){
-		$this->path=$path;
-		$this->connected=$this->apiCall('login',array('username'=>$user,'password'=>$password));
-	}
-
-	/**
-	* check if we are stull logged in on the remote cloud
-	*
-	*/
-	public function isLoggedIn(){
-		if(!$this->connected){
-			return false;
-		}
-		return $this->apiCall('checklogin');
-	}
-
-	public function __get($name){
-		switch($name){
-			case 'connected':
-				return $this->connected;
-		}
-	}
-
-	/**
-	* disconnect from the remote cloud
-	*
-	*/
-	public function disconnect(){
-		$this->connected=false;
-		if(is_file($this->cookiefile)){
-			unlink($this->cookiefile);
-		}
-		$this->cookiefile=false;
-	}
-
-	/**
-	* create a new file or directory
-	* @param string $dir
-	* @param string $name
-	* @param string $type
-	*/
-	public function newFile($dir,$name,$type){
-		if(!$this->connected){
-			return false;
-		}
-		return $this->apiCall('new',array('dir'=>$dir,'name'=>$name,'type'=>$type),true);
-	}
-
-	/**
-	* deletes a file or directory
-	* @param string $dir
-	* @param string $file
-	*/
-	public function delete($dir,$name){
-		if(!$this->connected){
-			return false;
-		}
-		return $this->apiCall('delete',array('dir'=>$dir,'file'=>$name),true);
-	}
-
-	/**
-	* moves a file or directory
-	* @param string $sorceDir
-	* @param string $sorceFile
-	* @param string $targetDir
-	* @param string $targetFile
-	*/
-	public function move($sourceDir,$sourceFile,$targetDir,$targetFile){
-		if(!$this->connected){
-			return false;
-		}
-		return $this->apiCall('move',array('sourcedir'=>$sourceDir,'source'=>$sourceFile,'targetdir'=>$targetDir,'target'=>$targetFile),true);
-	}
-
-	/**
-	* copies a file or directory
-	* @param string $sorceDir
-	* @param string $sorceFile
-	* @param string $targetDir
-	* @param string $targetFile
-	*/
-	public function copy($sourceDir,$sourceFile,$targetDir,$targetFile){
-		if(!$this->connected){
-			return false;
-		}
-		return $this->apiCall('copy',array('sourcedir'=>$sourceDir,'source'=>$sourceFile,'targetdir'=>$targetDir,'target'=>$targetFile),true);
-	}
-
-	/**
-	* get a file tree
-	* @param string $dir
-	*/
-	public function getTree($dir){
-		if(!$this->connected){
-			return false;
-		}
-		return $this->apiCall('gettree',array('dir'=>$dir),true);
-	}
-
-	/**
-	* get the files inside a directory of the remote cloud
-	* @param string $dir
-	*/
-	public function getFiles($dir){
-		if(!$this->connected){
-			return false;
-		}
-		return $this->apiCall('getfiles',array('dir'=>$dir),true);
-	}
-
-	/**
-	* get a remove file and save it in a temporary file and return the path of the temporary file
-	* @param string $dir
-	* @param string $file
-	* @return string
-	*/
-	public function getFile($dir, $file){
-		if(!$this->connected){
-			return false;
-		}
-		$ch=curl_init();
-		if(!$this->cookiefile){
-			$this->cookiefile=sys_get_temp_dir().'/remoteCloudCookie'.uniqid();
-		}
-		$tmpfile=tempnam(sys_get_temp_dir(),'remoteCloudFile');
-		$fp=fopen($tmpfile,'w+');
-		$url=$this->path.="/files/api.php?action=get&dir=$dir&file=$file";
-		curl_setopt($ch,CURLOPT_URL,$url);
-		curl_setopt($ch, CURLOPT_COOKIEFILE,$this->cookiefile);
-		curl_setopt($ch, CURLOPT_COOKIEJAR,$this->cookiefile);
-		curl_setopt($ch, CURLOPT_FILE, $fp);
-		curl_exec($ch);
-		fclose($fp);
-		curl_close($ch);
-		return $tmpfile;
-	}
-
-	public function sendFile($sourceDir,$sourceFile,$targetDir,$targetFile){
-		global $WEBROOT;
-		$source=$sourceDir.'/'.$sourceFile;
-		$tmp=OC_FILESYSTEM::toTmpFile($source);
-		return $this->sendTmpFile($tmp,$targetDir,$targetFile);
-	}
-
-	public function sendTmpFile($tmp,$targetDir,$targetFile){
-		$token=sha1(uniqid().$tmp);
-		global $WEBROOT;
-		$file=sys_get_temp_dir().'/'.'remoteCloudFile'.$token;
-		rename($tmp,$file);
-		if( OC_CONFIG::getValue( "forcessl", false ) or isset($_SERVER['HTTPS']) and $_SERVER['HTTPS'] == 'on') {
-			$url = "https://". $_SERVER['SERVER_NAME'] . $WEBROOT;
-		}else{
-			$url = "http://". $_SERVER['SERVER_NAME'] . $WEBROOT;
-		}
-		return $this->apiCall('pull',array('dir'=>$targetDir,'file'=>$targetFile,'token'=>$token,'source'=>$url),true);
-	}
-}
-
-function OC_CONNECT_TEST($path,$user,$password){
-	echo 'connecting...';
-	$remote=OC_CONNECT::connect($path,$user,$password);
-	if($remote->connected){
-		echo 'done<br/>';
-		if($remote->isLoggedIn()){
-			echo 'logged in, session working<br/>';
-			echo 'trying to get remote files...';
-			$files=$remote->getFiles('');
-			if($files){
-				echo count($files).' files found:<br/>';
-				foreach($files as $file){
-					echo "{$file['type']} {$file['name']}: {$file['size']} bytes<br/>";
-				}
-				echo 'getting file "'.$file['name'].'"...';
-				$size=$file['size'];
-				$file=$remote->getFile('',$file['name']);
-				if(file_exists($file)){
-					$newSize=filesize($file);
-					if($size!=$newSize){
-						echo "fail<br/>Error: $newSize bytes received, $size expected.";
-						echo '<br/><br/>Recieved file:<br/>';
-						readfile($file);
-						unlink($file);
-						return;
-					}
-					OC_FILESYSTEM::fromTmpFile($file,'/remoteFile');
-					echo 'done<br/>';
-					echo 'sending file "burning_avatar.png"...';
-					$res=$remote->sendFile('','burning_avatar.png','','burning_avatar.png');
-					if($res){
-						echo 'done<br/>';
-					}else{
-						echo 'fail<br/>';
-					}
-				}else{
-					echo 'fail<br/>';
-				}
-			}else{
-				echo 'fail<br/>';
-			}
-		}else{
-			echo 'no longer logged in, session fail<br/>';
-		}
-	}else{
-		echo 'fail<br/>';
-	}
-	$remote->disconnect();
-	die();
-}
-
-
-?>
diff --git a/lib/Connector/Sabre/auth.php b/lib/connector/sabre/auth.php
index cfe7723e761..1e87c7cee08 100644
--- a/lib/Connector/Sabre/auth.php
+++ b/lib/connector/sabre/auth.php
@@ -1,5 +1,4 @@
 <?php
-require_once("lib/base.php");
 /**
  * HTTP Basic authentication backend class
  *
@@ -24,8 +23,8 @@ class OC_Connector_Sabre_Auth extends Sabre_DAV_Auth_Backend_AbstractBasic {
 	 * @return bool
 	 */
 	protected function validateUserPass($username, $password){
-		if(OC_USER::login($username,$password)){
-			OC_UTIL::setUpFS();
+		if(OC_User::login($username,$password)){
+			OC_Util::setUpFS();
 			return true;
 		}
 		else{
diff --git a/lib/Connector/Sabre/directory.php b/lib/connector/sabre/directory.php
index d0ff87f9b1a..139c6b784b1 100644
--- a/lib/Connector/Sabre/directory.php
+++ b/lib/connector/sabre/directory.php
@@ -1,7 +1,4 @@
 <?php
-
-require_once("lib/base.php");
-
 /**
  * Directory class 
  * 
@@ -25,7 +22,7 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa
 	public function createFile($name, $data = null) {
 
 		$newPath = $this->path . '/' . $name;
-		OC_FILESYSTEM::file_put_contents($newPath,$data);
+		OC_Filesystem::file_put_contents($newPath,$data);
 
 	}
 
@@ -38,7 +35,7 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa
 	public function createDirectory($name) {
 
 		$newPath = $this->path . '/' . $name;
-		OC_FILESYSTEM::mkdir($newPath);
+		OC_Filesystem::mkdir($newPath);
 
 	}
 
@@ -53,9 +50,9 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa
 
 		$path = $this->path . '/' . $name;
 
-		if (!OC_FILESYSTEM::file_exists($path)) throw new Sabre_DAV_Exception_FileNotFound('File with name ' . $path . ' could not be located');
+		if (!OC_Filesystem::file_exists($path)) throw new Sabre_DAV_Exception_FileNotFound('File with name ' . $path . ' could not be located');
 
-		if (OC_FILESYSTEM::is_dir($path)) {
+		if (OC_Filesystem::is_dir($path)) {
 
 			return new OC_Connector_Sabre_Directory($path);
 
@@ -76,8 +73,8 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa
 
 		$nodes = array();
 		// foreach(scandir($this->path) as $node) if($node!='.' && $node!='..') $nodes[] = $this->getChild($node);
-		if( OC_FILESYSTEM::is_dir($this->path)){
-			$dh = OC_FILESYSTEM::opendir($this->path);
+		if( OC_Filesystem::is_dir($this->path)){
+			$dh = OC_Filesystem::opendir($this->path);
 			while(( $node = readdir($dh)) !== false ){
 				if($node!='.' && $node!='..'){
 					$nodes[] = $this->getChild($node);
@@ -97,7 +94,7 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa
 	public function childExists($name) {
 
 		$path = $this->path . '/' . $name;
-		return OC_FILESYSTEM::file_exists($path);
+		return OC_Filesystem::file_exists($path);
 
 	}
 
@@ -109,7 +106,7 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa
 	public function delete() {
 
 		foreach($this->getChildren() as $child) $child->delete();
-		OC_FILESYSTEM::rmdir($this->path);
+		OC_Filesystem::rmdir($this->path);
 
 	}
 
@@ -121,8 +118,8 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa
 	public function getQuotaInfo() {
 
 		return array(
-			OC_FILESYSTEM::filesize('/'),
-			OC_FILESYSTEM::free_space()
+			OC_Filesystem::filesize('/'),
+			OC_Filesystem::free_space()
 			);
 
 	}
diff --git a/lib/Connector/Sabre/file.php b/lib/connector/sabre/file.php
index bb5ab738430..b049f39c171 100644
--- a/lib/Connector/Sabre/file.php
+++ b/lib/connector/sabre/file.php
@@ -1,6 +1,4 @@
 <?php
-
-require_once("lib/base.php");
 /**
  * File class 
  * 
@@ -20,7 +18,7 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D
 	 */
 	public function put($data) {
 
-		OC_FILESYSTEM::file_put_contents($this->path,$data);
+		OC_Filesystem::file_put_contents($this->path,$data);
 
 	}
 
@@ -31,7 +29,7 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D
 	 */
 	public function get() {
 
-		return OC_FILESYSTEM::file_get_contents($this->path);
+		return OC_Filesystem::file_get_contents($this->path);
 
 	}
 
@@ -42,7 +40,7 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D
 	 */
 	public function delete() {
 
-		OC_FILESYSTEM::unlink($this->path);
+		OC_Filesystem::unlink($this->path);
 
 	}
 
@@ -53,7 +51,7 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D
 	 */
 	public function getSize() {
 	
-		return OC_FILESYSTEM::filesize($this->path);
+		return OC_Filesystem::filesize($this->path);
 
 	}
 
@@ -82,7 +80,7 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D
 	 */
 	public function getContentType() {
 
-		return OC_FILESYSTEM::getMimeType($this->path);
+		return OC_Filesystem::getMimeType($this->path);
 
 	}
 }
diff --git a/lib/Connector/Sabre/locks.php b/lib/connector/sabre/locks.php
index 4f3eb7bbf52..7164d9a09c1 100644
--- a/lib/Connector/Sabre/locks.php
+++ b/lib/connector/sabre/locks.php
@@ -1,6 +1,4 @@
 <?php
-require_once("lib/base.php");
-
 /**
  * The Lock manager allows you to handle all file-locks centrally.
  *
@@ -52,7 +50,7 @@ class OC_Connector_Sabre_Locks extends Sabre_DAV_Locks_Backend_Abstract {
 		// pure sql. MySQL's non-standard string concatination prevents us
 		// from doing this though.
 		$query = 'SELECT * FROM *PREFIX*locks WHERE userid = ? AND (created + timeout) > ? AND ((uri = ?)';
-		$params = array(OC_USER::getUser(),time(),$uri);
+		$params = array(OC_User::getUser(),time(),$uri);
 
 		// We need to check locks for every part in the uri.
 		$uriParts = explode('/',$uri);
@@ -124,10 +122,10 @@ class OC_Connector_Sabre_Locks extends Sabre_DAV_Locks_Backend_Abstract {
 	
 		if ($exists) {
 			$query = OC_DB::prepare( 'UPDATE *PREFIX*locks SET owner = ?, timeout = ?, scope = ?, depth = ?, uri = ?, created = ? WHERE userid = ? AND token = ?' );
-			$result = $query->execute( array($lockInfo->owner,$lockInfo->timeout,$lockInfo->scope,$lockInfo->depth,$uri,$lockInfo->created,OC_USER::getUser(),$lockInfo->token));
+			$result = $query->execute( array($lockInfo->owner,$lockInfo->timeout,$lockInfo->scope,$lockInfo->depth,$uri,$lockInfo->created,OC_User::getUser(),$lockInfo->token));
 		} else {
 			$query = OC_DB::prepare( 'INSERT INTO *PREFIX*locks (userid,owner,timeout,scope,depth,uri,created,token) VALUES (?,?,?,?,?,?,?,?)' );
-			$result = $query->execute( array(OC_USER::getUser(),$lockInfo->owner,$lockInfo->timeout,$lockInfo->scope,$lockInfo->depth,$uri,$lockInfo->created,$lockInfo->token));
+			$result = $query->execute( array(OC_User::getUser(),$lockInfo->owner,$lockInfo->timeout,$lockInfo->scope,$lockInfo->depth,$uri,$lockInfo->created,$lockInfo->token));
 		}
 
 		return true;
@@ -144,11 +142,10 @@ class OC_Connector_Sabre_Locks extends Sabre_DAV_Locks_Backend_Abstract {
 	public function unlock($uri,Sabre_DAV_Locks_LockInfo $lockInfo) {
 
 		$query = OC_DB::prepare( 'DELETE FROM *PREFIX*locks WHERE userid = ? AND uri=? AND token=?' );
-		$result = $query->execute( array(OC_USER::getUser(),$uri,$lockInfo->token));
+		$result = $query->execute( array(OC_User::getUser(),$uri,$lockInfo->token));
 
 		return $result->numRows() === 1;
 
 	}
 
 }
-
diff --git a/lib/Connector/Sabre/node.php b/lib/connector/sabre/node.php
index dc1013dc524..ace572a1ee3 100644
--- a/lib/Connector/Sabre/node.php
+++ b/lib/connector/sabre/node.php
@@ -1,7 +1,4 @@
 <?php
-
-require_once("lib/base.php");
-
 /**
  * Base node-class 
  *
@@ -73,12 +70,12 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 		$newPath = $parentPath . '/' . $newName;
 		$oldPath = $this->path;
 
-		OC_FILESYSTEM::rename($this->path,$newPath);
+		OC_Filesystem::rename($this->path,$newPath);
 	
 		$this->path = $newPath;
 		
 		$query = OC_DB::prepare( 'UPDATE *PREFIX*properties SET propertypath = ? WHERE userid = ? AND propertypath = ?' );
-		$query->execute( array( $newPath,OC_USER::getUser(), $oldPath ));
+		$query->execute( array( $newPath,OC_User::getUser(), $oldPath ));
 
 	}
 
@@ -91,7 +88,7 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 	 */
 	public function getLastModified() {
 
-		return OC_FILESYSTEM::filemtime($this->path);
+		return OC_Filesystem::filemtime($this->path);
 
 	}
 
@@ -109,17 +106,17 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 			if (is_null($propertyValue)) {
 				if(array_key_exists( $propertyName, $existing )){
 					$query = OC_DB::prepare( 'DELETE FROM *PREFIX*properties WHERE userid = ? AND propertypath = ? AND propertyname = ?' );
-					$query->execute( array( OC_USER::getUser(), $this->path, $propertyName ));
+					$query->execute( array( OC_User::getUser(), $this->path, $propertyName ));
 				}
 			}
 			else {
 				if(!array_key_exists( $propertyName, $existing )){
 					$query = OC_DB::prepare( 'INSERT INTO *PREFIX*properties (userid,propertypath,propertyname,propertyvalue) VALUES(?,?,?,?)' );
-					$query->execute( array( OC_USER::getUser(), $this->path, $propertyName,$propertyValue ));
+					$query->execute( array( OC_User::getUser(), $this->path, $propertyName,$propertyValue ));
 				}
 				else{
 					$query = OC_DB::prepare( 'UPDATE *PREFIX*properties SET propertyvalue = ? WHERE userid = ? AND propertypath = ? AND propertyname = ?' );
-					$query->execute( array( $propertyValue,OC_USER::getUser(), $this->path, $propertyName ));
+					$query->execute( array( $propertyValue,OC_User::getUser(), $this->path, $propertyName ));
 				}
 			}
 
@@ -139,7 +136,7 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 	function getProperties($properties) {
 		// At least some magic in here :-)
 		$query = OC_DB::prepare( 'SELECT * FROM *PREFIX*properties WHERE userid = ? AND propertypath = ?' );
-		$result = $query->execute( array( OC_USER::getUser(), $this->path ));
+		$result = $query->execute( array( OC_User::getUser(), $this->path ));
 
 		$existing = array();
 		while( $row = $result->fetchRow()){
@@ -158,4 +155,3 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 		return $props;
 	}
 }
-
diff --git a/lib/database.php b/lib/db.php
index 8d7c76756c1..858db09b764 100644
--- a/lib/database.php
+++ b/lib/db.php
@@ -38,13 +38,13 @@ class OC_DB {
 	 */
 	static public function connect(){
 		// The global data we need
-		$CONFIG_DBNAME = OC_CONFIG::getValue( "dbname", "owncloud" );;
-		$CONFIG_DBHOST = OC_CONFIG::getValue( "dbhost", "" );;
-		$CONFIG_DBUSER = OC_CONFIG::getValue( "dbuser", "" );;
-		$CONFIG_DBPASSWORD = OC_CONFIG::getValue( "dbpassword", "" );;
-		$CONFIG_DBTYPE = OC_CONFIG::getValue( "dbtype", "sqlite" );;
+		$CONFIG_DBNAME = OC_Config::getValue( "dbname", "owncloud" );;
+		$CONFIG_DBHOST = OC_Config::getValue( "dbhost", "" );;
+		$CONFIG_DBUSER = OC_Config::getValue( "dbuser", "" );;
+		$CONFIG_DBPASSWORD = OC_Config::getValue( "dbpassword", "" );;
+		$CONFIG_DBTYPE = OC_Config::getValue( "dbtype", "sqlite" );;
 		global $SERVERROOT;
-		$datadir=OC_CONFIG::getValue( "datadirectory", "$SERVERROOT/data" );
+		$datadir=OC_Config::getValue( "datadirectory", "$SERVERROOT/data" );
 
 		// do nothing if the connection already has been established
 		if(!self::$DBConnection){
@@ -235,8 +235,8 @@ class OC_DB {
 	 * TODO: write more documentation
 	 */
 	public static function createDbFromStructure( $file ){
-		$CONFIG_DBNAME  = OC_CONFIG::getValue( "dbname", "owncloud" );
-		$CONFIG_DBTABLEPREFIX = OC_CONFIG::getValue( "dbtableprefix", "oc_" );
+		$CONFIG_DBNAME  = OC_Config::getValue( "dbname", "owncloud" );
+		$CONFIG_DBTABLEPREFIX = OC_Config::getValue( "dbtableprefix", "oc_" );
 
 		self::connectScheme();
 
@@ -259,7 +259,7 @@ class OC_DB {
 		if( $definition instanceof MDB2_Schema_Error ){
 			die( $definition->getMessage().': '.$definition->getUserInfo());
 		}
-// 		if(OC_CONFIG::getValue('dbtype','sqlite')=='sqlite'){
+// 		if(OC_Config::getValue('dbtype','sqlite')=='sqlite'){
 // 			$definition['overwrite']=true;//always overwrite for sqlite
 // 		}
 		$ret=self::$schema->createDatabase( $definition );
@@ -302,8 +302,8 @@ class OC_DB {
 	private static function processQuery( $query ){
 		self::connect();
 		// We need Database type and table prefix
-		$CONFIG_DBTYPE = OC_CONFIG::getValue( "dbtype", "sqlite" );
-		$CONFIG_DBTABLEPREFIX = OC_CONFIG::getValue( "dbtableprefix", "oc_" );
+		$CONFIG_DBTYPE = OC_Config::getValue( "dbtype", "sqlite" );
+		$CONFIG_DBTABLEPREFIX = OC_Config::getValue( "dbtableprefix", "oc_" );
 		
 		// differences is getting the current timestamp
 		$query = str_replace( 'NOW()', self::$DBConnection->now(), $query );
@@ -339,8 +339,8 @@ class OC_DB {
 	 * @param string $file the xml file describing the tables
 	 */
 	public static function removeDBStructure($file){
-		$CONFIG_DBNAME  = OC_CONFIG::getValue( "dbname", "owncloud" );
-		$CONFIG_DBTABLEPREFIX = OC_CONFIG::getValue( "dbtableprefix", "oc_" );
+		$CONFIG_DBNAME  = OC_Config::getValue( "dbname", "owncloud" );
+		$CONFIG_DBTABLEPREFIX = OC_Config::getValue( "dbtableprefix", "oc_" );
 		self::connectScheme();
 
 		// read file
@@ -362,4 +362,3 @@ class OC_DB {
 		}
 	}
 }
-?>
\ No newline at end of file
diff --git a/lib/fakedirstream.php b/lib/fakedirstream.php
new file mode 100644
index 00000000000..fa3e64da62c
--- /dev/null
+++ b/lib/fakedirstream.php
@@ -0,0 +1,45 @@
+<?php
+global $FAKEDIRS;
+$FAKEDIRS=array();
+
+class fakeDirStream{
+	private $name;
+	private $data;
+	private $index;
+
+	public function dir_opendir($path,$options){
+		global $FAKEDIRS;
+		$url=parse_url($path);
+		$this->name=substr($path,strlen('fakedir://'));
+		$this->index=0;
+		if(isset($FAKEDIRS[$this->name])){
+			$this->data=$FAKEDIRS[$this->name];
+		}else{
+			$this->data=array();
+		}
+		return true;
+	}
+
+	public function dir_readdir(){
+		if($this->index>=count($this->data)){
+			return false;
+		}
+		$filename=$this->data[$this->index];
+		$this->index++;
+		return $filename;
+	}
+
+	public function dir_closedir() {
+		$this->data=false;
+		$this->name='';
+		return true;
+	}
+
+	public function dir_rewinddir() {
+		$this->index=0;
+		return true;
+	}
+}
+ 
+stream_wrapper_register("fakedir", "fakeDirStream");
+
diff --git a/lib/files.php b/lib/files.php
index d8133667954..d189a96fd89 100644
--- a/lib/files.php
+++ b/lib/files.php
@@ -21,14 +21,11 @@
 *
 */
 
-require_once("log.php");
-
-
 /**
  * Class for fileserver access
  *
  */
-class OC_FILES {
+class OC_Files {
 	static $tmpFiles=array();
 
 	/**
@@ -45,21 +42,21 @@ class OC_FILES {
 		$dirs=array();
 		$file=array();
 		$files=array();
-		if(OC_FILESYSTEM::is_dir($directory)) {
-			if ($dh = OC_FILESYSTEM::opendir($directory)) {
+		if(OC_Filesystem::is_dir($directory)) {
+			if ($dh = OC_Filesystem::opendir($directory)) {
 			while (($filename = readdir($dh)) !== false) {
 				if($filename<>'.' and $filename<>'..' and substr($filename,0,1)!='.'){
 					$file=array();
 					$filesfound=true;
 					$file['name']=$filename;
 					$file['directory']=$directory;
-					$stat=OC_FILESYSTEM::stat($directory.'/'.$filename);
+					$stat=OC_Filesystem::stat($directory.'/'.$filename);
 					$file=array_merge($file,$stat);
-					$file['size']=OC_FILESYSTEM::filesize($directory.'/'.$filename);
-					$file['mime']=OC_FILES::getMimeType($directory .'/'. $filename);
-					$file['readable']=OC_FILESYSTEM::is_readable($directory .'/'. $filename);
-					$file['writeable']=OC_FILESYSTEM::is_writeable($directory .'/'. $filename);
-					$file['type']=OC_FILESYSTEM::filetype($directory .'/'. $filename);
+					$file['size']=OC_Filesystem::filesize($directory.'/'.$filename);
+					$file['mime']=OC_Files::getMimeType($directory .'/'. $filename);
+					$file['readable']=OC_Filesystem::is_readable($directory .'/'. $filename);
+					$file['writeable']=OC_Filesystem::is_writeable($directory .'/'. $filename);
+					$file['type']=OC_Filesystem::filetype($directory .'/'. $filename);
 					if($file['type']=='dir'){
 						$dirs[$file['name']]=$file;
 					}else{
@@ -101,16 +98,16 @@ class OC_FILES {
 			}
 			foreach($files as $file){
 				$file=$dir.'/'.$file;
-				if(OC_FILESYSTEM::is_file($file)){
-					$tmpFile=OC_FILESYSTEM::toTmpFile($file);
+				if(OC_Filesystem::is_file($file)){
+					$tmpFile=OC_Filesystem::toTmpFile($file);
 					self::$tmpFiles[]=$tmpFile;
 					$zip->addFile($tmpFile,basename($file));
-				}elseif(OC_FILESYSTEM::is_dir($file)){
+				}elseif(OC_Filesystem::is_dir($file)){
 					zipAddDir($file,$zip);
 				}
 			}
 			$zip->close();
-		}elseif(OC_FILESYSTEM::is_dir($dir.'/'.$files)){
+		}elseif(OC_Filesystem::is_dir($dir.'/'.$files)){
 			$zip = new ZipArchive();
 			$filename = sys_get_temp_dir()."/ownCloud.zip";
 			if ($zip->open($filename, ZIPARCHIVE::CREATE)!==TRUE) {
@@ -123,7 +120,7 @@ class OC_FILES {
 			$zip=false;
 			$filename=$dir.'/'.$files;
 		}
-		if($zip or OC_FILESYSTEM::is_readable($filename)){
+		if($zip or OC_Filesystem::is_readable($filename)){
 			header('Content-Disposition: attachment; filename='.basename($filename));
 			header('Content-Transfer-Encoding: binary');
 			header('Expires: 0');
@@ -133,12 +130,12 @@ class OC_FILES {
 				header('Content-Type: application/zip');
 				header('Content-Length: ' . filesize($filename));
 			}else{
-				header('Content-Type: ' . OC_FILESYSTEM::getMimeType($filename));
-				header('Content-Length: ' . OC_FILESYSTEM::filesize($filename));
+				header('Content-Type: ' . OC_Filesystem::getMimeType($filename));
+				header('Content-Length: ' . OC_Filesystem::filesize($filename));
 			}
-		}elseif($zip or !OC_FILESYSTEM::file_exists($filename)){
+		}elseif($zip or !OC_Filesystem::file_exists($filename)){
 			header("HTTP/1.0 404 Not Found");
-			$tmpl = new OC_TEMPLATE( '', '404', 'guest' );
+			$tmpl = new OC_Template( '', '404', 'guest' );
 			$tmpl->assign('file',$filename);
 			$tmpl->printPage();
 // 			die('404 Not Found');
@@ -147,12 +144,12 @@ class OC_FILES {
 			die('403 Forbidden');
 		}
 		ob_end_clean();
-// 		OC_LOG::event($_SESSION['username'],3,"$dir/$files");
+// 		OC_Log::event($_SESSION['username'],3,"$dir/$files");
 		if($zip){
 			readfile($filename);
 			unlink($filename);
 		}else{
-			OC_FILESYSTEM::readfile($filename);
+			OC_Filesystem::readfile($filename);
 		}
 		foreach(self::$tmpFiles as $tmpFile){
 			if(file_exists($tmpFile) and is_file($tmpFile)){
@@ -170,10 +167,10 @@ class OC_FILES {
 	* @param file $target
 	*/
 	public static function move($sourceDir,$source,$targetDir,$target){
-		if(OC_USER::isLoggedIn()){
+		if(OC_User::isLoggedIn()){
 			$targetFile=$targetDir.'/'.$target;
 			$sourceFile=$sourceDir.'/'.$source;
-			return OC_FILESYSTEM::rename($sourceFile,$targetFile);
+			return OC_Filesystem::rename($sourceFile,$targetFile);
 		}
 	}
 
@@ -186,10 +183,10 @@ class OC_FILES {
 	* @param file $target
 	*/
 	public static function copy($sourceDir,$source,$targetDir,$target){
-		if(OC_USER::isLoggedIn()){
+		if(OC_User::isLoggedIn()){
 			$targetFile=$targetDir.'/'.$target;
 			$sourceFile=$sourceDir.'/'.$source;
-			return OC_FILESYSTEM::copy($sourceFile,$targetFile);
+			return OC_Filesystem::copy($sourceFile,$targetFile);
 		}
 	}
 
@@ -201,15 +198,15 @@ class OC_FILES {
 	* @param type $type
 	*/
 	public static function newFile($dir,$name,$type){
-		if(OC_USER::isLoggedIn()){
+		if(OC_User::isLoggedIn()){
 			$file=$dir.'/'.$name;
 			if($type=='dir'){
-				return OC_FILESYSTEM::mkdir($file);
+				return OC_Filesystem::mkdir($file);
 			}elseif($type=='file'){
-				$fileHandle=OC_FILESYSTEM::fopen($file, 'w');
+				$fileHandle=OC_Filesystem::fopen($file, 'w');
 				if($fileHandle){
 					fclose($fileHandle);
-// 					OC_LOG::event($_SESSION['username'],4,"$dir/$name");
+// 					OC_Log::event($_SESSION['username'],4,"$dir/$name");
 					return true;
 				}else{
 					return false;
@@ -225,12 +222,12 @@ class OC_FILES {
 	* @param file $name
 	*/
 	public static function delete($dir,$file){
-		if(OC_USER::isLoggedIn()){
+		if(OC_User::isLoggedIn()){
 			$file=$dir.'/'.$file;
-			if(OC_FILESYSTEM::is_file($file)){
-				return OC_FILESYSTEM::unlink($file);
-			}elseif(OC_FILESYSTEM::is_dir($file)){
-				return OC_FILESYSTEM::delTree($file);
+			if(OC_Filesystem::is_file($file)){
+				return OC_Filesystem::unlink($file);
+			}elseif(OC_Filesystem::is_dir($file)){
+				return OC_Filesystem::delTree($file);
 			}
 		}
 	}
@@ -242,7 +239,7 @@ class OC_FILES {
 	* @return string  guessed mime type
 	*/
 	static function getMimeType($path){
-		return OC_FILESYSTEM::getMimeType($path);
+		return OC_Filesystem::getMimeType($path);
 	}
 
 	/**
@@ -252,7 +249,7 @@ class OC_FILES {
 	* @return array
 	*/
 	static function getTree($path){
-		return OC_FILESYSTEM::getTree($path);
+		return OC_Filesystem::getTree($path);
 	}
 
 	/**
@@ -276,7 +273,7 @@ class OC_FILES {
 		$httpCode=$info['http_code'];
 		curl_close($ch);
 		if($httpCode==200 or $httpCode==0){
-			OC_FILESYSTEM::fromTmpFile($tmpfile,$dir.'/'.$file);
+			OC_Filesystem::fromTmpFile($tmpfile,$dir.'/'.$file);
 			return true;
 		}else{
 			return false;
@@ -290,7 +287,7 @@ class OC_FILES {
 	static function setUploadLimit($size){
 		global $SERVERROOT;
 		global $WEBROOT;
-		$size=OC_HELPER::humanFileSize($size);
+		$size=OC_Helper::humanFileSize($size);
 		$size=substr($size,0,-1);//strip the B
 		$size=str_replace(' ','',$size); //remove the space between the size and the postfix
 		$content = "ErrorDocument 404 /$WEBROOT/core/templates/404.php\n";//custom 404 error page
@@ -301,79 +298,3 @@ class OC_FILES {
 		@file_put_contents($SERVERROOT.'/.htaccess', $content); //supress errors in case we don't have permissions for it
 	}
 }
-
-function zipAddDir($dir,$zip,$internalDir=''){
-    $dirname=basename($dir);
-    $zip->addEmptyDir($internalDir.$dirname);
-    $internalDir.=$dirname.='/';
-    $files=OC_FILES::getdirectorycontent($dir);
-    foreach($files as $file){
-        $filename=$file['name'];
-        $file=$dir.'/'.$filename;
-        if(OC_FILESYSTEM::is_file($file)){
-			$tmpFile=OC_FILESYSTEM::toTmpFile($file);
-			OC_FILES::$tmpFiles[]=$tmpFile;
-            $zip->addFile($tmpFile,$internalDir.$filename);
-        }elseif(OC_FILESYSTEM::is_dir($file)){
-            zipAddDir($file,$zip,$internalDir);
-        }
-    }
-}
-
-if(!function_exists('sys_get_temp_dir')) {
-    function sys_get_temp_dir() {
-        if( $temp=getenv('TMP') )        return $temp;
-        if( $temp=getenv('TEMP') )        return $temp;
-        if( $temp=getenv('TMPDIR') )    return $temp;
-        $temp=tempnam(__FILE__,'');
-        if (file_exists($temp)) {
-          unlink($temp);
-          return dirname($temp);
-        }
-        return null;
-    }
-}
-
-global $FAKEDIRS;
-$FAKEDIRS=array();
-
-class fakeDirStream{
-	private $name;
-	private $data;
-	private $index;
-
-	public function dir_opendir($path,$options){
-		global $FAKEDIRS;
-		$url=parse_url($path);
-		$this->name=substr($path,strlen('fakedir://'));
-		$this->index=0;
-		if(isset($FAKEDIRS[$this->name])){
-			$this->data=$FAKEDIRS[$this->name];
-		}else{
-			$this->data=array();
-		}
-		return true;
-	}
-
-	public function dir_readdir(){
-		if($this->index>=count($this->data)){
-			return false;
-		}
-		$filename=$this->data[$this->index];
-		$this->index++;
-		return $filename;
-	}
-
-	public function dir_closedir() {
-		$this->data=false;
-		$this->name='';
-		return true;
-	}
-
-	public function dir_rewinddir() {
-		$this->index=0;
-		return true;
-	}
-}
-stream_wrapper_register("fakedir", "fakeDirStream");
-?>
diff --git a/lib/filestorage.php b/lib/filestorage.php
index 601cf6f37fe..b398285d340 100644
--- a/lib/filestorage.php
+++ b/lib/filestorage.php
@@ -23,7 +23,7 @@
 /**
  * Privde a common interface to all different storage options
  */
-class OC_FILESTORAGE{
+class OC_Filestorage{
 	public function __construct($parameters){}
 	public function mkdir($path){}
 	public function rmdir($path){}
@@ -58,363 +58,3 @@ class OC_FILESTORAGE{
 	public function search($query){}
 	public function getLocalFile($path){}// get a path to a local version of the file, whether the original file is local or remote
 }
-
-
-OC_FILESYSTEM::registerStorageType('local','OC_FILESTORAGE_LOCAL',array('datadir'=>'string'));
-/**
- * for local filestore, we only have to map the paths
- */
-class OC_FILESTORAGE_LOCAL extends OC_FILESTORAGE{
-	private $datadir;
-	private static $mimetypes=null;
-	public function __construct($arguments){
-		$this->datadir=$arguments['datadir'];
-		if(substr($this->datadir,-1)!=='/'){
-			$this->datadir.='/';
-		}
-	}
-	public function mkdir($path){
-		if($return=mkdir($this->datadir.$path)){
-			$this->clearFolderSizeCache($path);
-		}
-		return $return;
-	}
-	public function rmdir($path){
-		if($return=rmdir($this->datadir.$path)){
-			$this->clearFolderSizeCache($path);
-		}
-		return $return;
-	}
-	public function opendir($path){
-		return opendir($this->datadir.$path);
-	}
-	public function is_dir($path){
-		return (is_dir($this->datadir.$path) or substr($path,-1)=='/');
-	}
-	public function is_file($path){
-		return is_file($this->datadir.$path);
-	}
-	public function stat($path){
-		return stat($this->datadir.$path);
-	}
-	public function filetype($path){
-		$filetype=filetype($this->datadir.$path);
-		if($filetype=='link'){
-			$filetype=filetype(readlink($this->datadir.$path));
-		}
-		return $filetype;
-	}
-	public function filesize($path){
-		if($this->is_dir($path)){
-			return $this->getFolderSize($path);
-		}else{
-			return filesize($this->datadir.$path);
-		}
-	}
-	public function is_readable($path){
-		return is_readable($this->datadir.$path);
-	}
-	public function is_writeable($path){
-		return is_writeable($this->datadir.$path);
-	}
-	public function file_exists($path){
-		return file_exists($this->datadir.$path);
-	}
-	public function readfile($path){
-		return readfile($this->datadir.$path);
-	}
-	public function filectime($path){
-		return filectime($this->datadir.$path);
-	}
-	public function filemtime($path){
-		return filemtime($this->datadir.$path);
-	}
-	public function fileatime($path){
-		return fileatime($this->datadir.$path);
-	}
-	public function file_get_contents($path){
-		return file_get_contents($this->datadir.$path);
-	}
-	public function file_put_contents($path,$data){
-		if($return=file_put_contents($this->datadir.$path,$data)){
-			$this->clearFolderSizeCache($path);
-		}
-	}
-	public function unlink($path){
-		if($return=unlink($this->datadir.$path)){
-			$this->clearFolderSizeCache($path);
-		}
-		return $return;
-	}
-	public function rename($path1,$path2){
-		if($return=rename($this->datadir.$path1,$this->datadir.$path2)){
-			$this->clearFolderSizeCache($path1);
-			$this->clearFolderSizeCache($path2);
-		}
-		return $return;
-	}
-	public function copy($path1,$path2){
-		if($this->is_dir($path2)){
-			if(!$this->file_exists($path2)){
-				$this->mkdir($path2);
-			}
-			$source=substr($path1,strrpos($path1,'/')+1);
-			$path2.=$source;
-		}
-		if($return=copy($this->datadir.$path1,$this->datadir.$path2)){
-			$this->clearFolderSizeCache($path2);
-		}
-		return $return;
-	}
-	public function fopen($path,$mode){
-		if($return=fopen($this->datadir.$path,$mode)){
-			switch($mode){
-				case 'r':
-					break;
-				case 'r+':
-				case 'w+':
-				case 'x+':
-				case 'a+':
-					$this->clearFolderSizeCache($path);
-					break;
-				case 'w':
-				case 'x':
-				case 'a':
-					$this->clearFolderSizeCache($path);
-					break;
-			}
-		}
-		return $return;
-	}
-
-	public function getMimeType($fspath){
-		if($this->is_readable($fspath)){
-			if (@is_dir($this->datadir.$fspath)) {
-				// directories are easy
-				return "httpd/unix-directory";
-			}elseif (function_exists('finfo_open') and function_exists('finfo_file') and $finfo=finfo_open(FILEINFO_MIME)){
-				$mimeType =strtolower(finfo_file($finfo,$this->datadir.$fspath));
-				$mimeType=substr($mimeType,0,strpos($mimeType,';'));
-				finfo_close($finfo);
-				return $mimeType;
-			} else if (function_exists("mime_content_type")) {
-				// use mime magic extension if available
-				$mime_type = mime_content_type($this->datadir.$fspath);
-			} else if (OC_HELPER::canExecute("file")) {
-				// it looks like we have a 'file' command,
-				// lets see it it does have mime support
-				$fp = popen("file -i -b '{$this->datadir}$fspath' 2>/dev/null", "r");
-				$reply = fgets($fp);
-				pclose($fp);
-
-				//trim the character set from the end of the response
-				$mime_type=substr($reply,0,strrpos($reply,' '));
-			}
-			if (empty($mime_type)) {
-				// Fallback solution: (try to guess the type by the file extension
-				if(!self::$mimetypes){
-					self::$mimetypes=include('mimetypes.list.php');
-				}
-				$extention=strtolower(strrchr(basename($fspath), "."));
-				$extention=substr($extention,1);//remove leading .
-				$mime_type=(isset(self::$mimetypes[$extention]))?self::$mimetypes[$extention]:'application/octet-stream';
-			}
-			return $mime_type;
-		}
-	}
-
-	public function toTmpFile($path){
-		$tmpFolder=sys_get_temp_dir();
-		$filename=tempnam($tmpFolder,'OC_TEMP_FILE_'.substr($path,strrpos($path,'.')));
-		$fileStats = stat($this->datadir.$path);
-		if(copy($this->datadir.$path,$filename)){
-			touch($filename, $fileStats['mtime'], $fileStats['atime']);
-			return $filename;
-		}else{
-			return false;
-		}
-	}
-
-	public function fromTmpFile($tmpFile,$path){
-		$fileStats = stat($tmpFile);
-		if(rename($tmpFile,$this->datadir.$path)){
-			touch($this->datadir.$path, $fileStats['mtime'], $fileStats['atime']);
-			$this->clearFolderSizeCache($path);
-			return true;
-		}else{
-			return false;
-		}
-	}
-	
-	public function fromUploadedFile($tmpFile,$path){
-		$fileStats = stat($tmpFile);
-		if(move_uploaded_file($tmpFile,$this->datadir.$path)){
-			touch($this->datadir.$path, $fileStats['mtime'], $fileStats['atime']);
-			$this->clearFolderSizeCache($path);
-			return true;
-		}else{
-			return false;
-		}
-	}
-
-	public function delTree($dir) {
-		$dirRelative=$dir;
-		$dir=$this->datadir.$dir;
-		if (!file_exists($dir)) return true;
-		if (!is_dir($dir) || is_link($dir)) return unlink($dir);
-		foreach (scandir($dir) as $item) {
-			if ($item == '.' || $item == '..') continue;
-			if(is_file($dir.'/'.$item)){
-				if(unlink($dir.'/'.$item)){
-					$this->clearFolderSizeCache($dir);
-				}
-			}elseif(is_dir($dir.'/'.$item)){
-				if (!$this->delTree($dirRelative. "/" . $item)){
-					return false;
-				};
-			}
-		}
-		if($return=rmdir($dir)){
-			$this->clearFolderSizeCache($dir);
-		}
-		return $return;
-	}
-
-	public function find($path){
-		$return=System::find($this->datadir.$path);
-		foreach($return as &$file){
-			$file=str_replace($file,$this->datadir,'');
-		}
-		return $return;
-	}
-
-	public function getTree($dir) {
-		if(substr($dir,-1,1)=='/'){
-			$dir=substr($dir,0,-1);
-		}
-		$tree=array();
-		$tree[]=$dir;
-		$dirRelative=$dir;
-		$dir=$this->datadir.$dir;
-		if (!file_exists($dir)) return true;
-		foreach (scandir($dir) as $item) {
-			if ($item == '.' || $item == '..') continue;
-			if(is_file($dir.'/'.$item)){
-				$tree[]=$dirRelative.'/'.$item;
-			}elseif(is_dir($dir.'/'.$item)){
-				if ($subTree=$this->getTree($dirRelative. "/" . $item)){
-					$tree=array_merge($tree,$subTree);
-				}
-			}
-		}
-		return $tree;
-	}
-
-	public function hash($type,$path,$raw){
-		return hash_file($type,$this->datadir.$path,$raw);
-	}
-	
-	public function free_space($path){
-		return disk_free_space($this->datadir.$path);
-	}
-	
-	public function search($query){
-		return $this->searchInDir($query);
-	}
-	public function getLocalFile($path){
-			return $this->datadir.$path;
-	}
-	
-	private function searchInDir($query,$dir=''){
-		$files=array();
-		foreach (scandir($this->datadir.$dir) as $item) {
-			if ($item == '.' || $item == '..') continue;
-			if(strstr(strtolower($item),strtolower($query))!==false){
-				$files[]=$dir.'/'.$item;
-			}
-			if(is_dir($this->datadir.$dir.'/'.$item)){
-				$files=array_merge($files,$this->searchInDir($query,$dir.'/'.$item));
-			}
-		}
-		return $files;
-	}
-	
-	/**
-	 * @brief get the size of folder and it's content
-	 * @param string $path file path
-	 * @return int size of folder and it's content
-	 */
-	public function getFolderSize($path){
-		$path=str_replace('//','/',$path);
-		if($this->is_dir($path) and substr($path,-1)!='/'){
-			$path.='/';
-		}
-		$query=OC_DB::prepare("SELECT size FROM *PREFIX*foldersize WHERE path=?");
-		$size=$query->execute(array($path))->fetchAll();
-		if(count($size)>0){// we already the size, just return it
-			return $size[0]['size'];
-		}else{//the size of the folder isn't know, calulate it
-			return $this->calculateFolderSize($path);
-		}
-	}
-
-	/**
-	 * @brief calulate the size of folder and it's content and cache it
-	 * @param string $path file path
-	 * @return int size of folder and it's content
-	 */
-	public function calculateFolderSize($path){
-		if($this->is_file($path)){
-			$path=dirname($path);
-		}
-		$path=str_replace('//','/',$path);
-		if($this->is_dir($path) and substr($path,-1)!='/'){
-			$path.='/';
-		}
-		$size=0;
-		if ($dh = $this->opendir($path)) {
-			while (($filename = readdir($dh)) !== false) {
-				if($filename!='.' and $filename!='..'){
-					$subFile=$path.'/'.$filename;
-					if($this->is_file($subFile)){
-						$size+=$this->filesize($subFile);
-					}else{
-						$size+=$this->getFolderSize($subFile);
-					}
-				}
-			}
-			if($size>0){
-				$query=OC_DB::prepare("INSERT INTO *PREFIX*foldersize VALUES(?,?)");
-				$result=$query->execute(array($path,$size));
-			}
-		}
-		return $size;
-	}
-
-	/**
-	 * @brief clear the folder size cache of folders containing a file
-	 * @param string $path
-	 */
-	public function clearFolderSizeCache($path){
-		if($this->is_file($path)){
-			$path=dirname($path);
-		}
-		$path=str_replace('//','/',$path);
-		if($this->is_dir($path) and substr($path,-1)!='/'){
-			$path.='/';
-		}
-		$query=OC_DB::prepare("DELETE FROM *PREFIX*foldersize WHERE path = ?");
-		$result=$query->execute(array($path));
-		if($path!='/' and $path!=''){
-			$parts=explode('/',$path);
-			//pop empty part
-			$part=array_pop($parts);
-			if(empty($part)){
-				array_pop($parts);
-			}
-			$parent=implode('/',$parts);
-			$this->clearFolderSizeCache($parent);
-		}
-	}
-}
-?>
\ No newline at end of file
diff --git a/lib/filestorage/local.php b/lib/filestorage/local.php
new file mode 100644
index 00000000000..3bbdd6b4137
--- /dev/null
+++ b/lib/filestorage/local.php
@@ -0,0 +1,357 @@
+<?php
+/**
+ * for local filestore, we only have to map the paths
+ */
+class OC_Filestorage_Local extends OC_Filestorage{
+	private $datadir;
+	private static $mimetypes=null;
+	public function __construct($arguments){
+		$this->datadir=$arguments['datadir'];
+		if(substr($this->datadir,-1)!=='/'){
+			$this->datadir.='/';
+		}
+	}
+	public function mkdir($path){
+		if($return=mkdir($this->datadir.$path)){
+			$this->clearFolderSizeCache($path);
+		}
+		return $return;
+	}
+	public function rmdir($path){
+		if($return=rmdir($this->datadir.$path)){
+			$this->clearFolderSizeCache($path);
+		}
+		return $return;
+	}
+	public function opendir($path){
+		return opendir($this->datadir.$path);
+	}
+	public function is_dir($path){
+		return (is_dir($this->datadir.$path) or substr($path,-1)=='/');
+	}
+	public function is_file($path){
+		return is_file($this->datadir.$path);
+	}
+	public function stat($path){
+		return stat($this->datadir.$path);
+	}
+	public function filetype($path){
+		$filetype=filetype($this->datadir.$path);
+		if($filetype=='link'){
+			$filetype=filetype(readlink($this->datadir.$path));
+		}
+		return $filetype;
+	}
+	public function filesize($path){
+		if($this->is_dir($path)){
+			return $this->getFolderSize($path);
+		}else{
+			return filesize($this->datadir.$path);
+		}
+	}
+	public function is_readable($path){
+		return is_readable($this->datadir.$path);
+	}
+	public function is_writeable($path){
+		return is_writeable($this->datadir.$path);
+	}
+	public function file_exists($path){
+		return file_exists($this->datadir.$path);
+	}
+	public function readfile($path){
+		return readfile($this->datadir.$path);
+	}
+	public function filectime($path){
+		return filectime($this->datadir.$path);
+	}
+	public function filemtime($path){
+		return filemtime($this->datadir.$path);
+	}
+	public function fileatime($path){
+		return fileatime($this->datadir.$path);
+	}
+	public function file_get_contents($path){
+		return file_get_contents($this->datadir.$path);
+	}
+	public function file_put_contents($path,$data){
+		if($return=file_put_contents($this->datadir.$path,$data)){
+			$this->clearFolderSizeCache($path);
+		}
+	}
+	public function unlink($path){
+		if($return=unlink($this->datadir.$path)){
+			$this->clearFolderSizeCache($path);
+		}
+		return $return;
+	}
+	public function rename($path1,$path2){
+		if($return=rename($this->datadir.$path1,$this->datadir.$path2)){
+			$this->clearFolderSizeCache($path1);
+			$this->clearFolderSizeCache($path2);
+		}
+		return $return;
+	}
+	public function copy($path1,$path2){
+		if($this->is_dir($path2)){
+			if(!$this->file_exists($path2)){
+				$this->mkdir($path2);
+			}
+			$source=substr($path1,strrpos($path1,'/')+1);
+			$path2.=$source;
+		}
+		if($return=copy($this->datadir.$path1,$this->datadir.$path2)){
+			$this->clearFolderSizeCache($path2);
+		}
+		return $return;
+	}
+	public function fopen($path,$mode){
+		if($return=fopen($this->datadir.$path,$mode)){
+			switch($mode){
+				case 'r':
+					break;
+				case 'r+':
+				case 'w+':
+				case 'x+':
+				case 'a+':
+					$this->clearFolderSizeCache($path);
+					break;
+				case 'w':
+				case 'x':
+				case 'a':
+					$this->clearFolderSizeCache($path);
+					break;
+			}
+		}
+		return $return;
+	}
+
+	public function getMimeType($fspath){
+		if($this->is_readable($fspath)){
+			if (@is_dir($this->datadir.$fspath)) {
+				// directories are easy
+				return "httpd/unix-directory";
+			}elseif (function_exists('finfo_open') and function_exists('finfo_file') and $finfo=finfo_open(FILEINFO_MIME)){
+				$mimeType =strtolower(finfo_file($finfo,$this->datadir.$fspath));
+				$mimeType=substr($mimeType,0,strpos($mimeType,';'));
+				finfo_close($finfo);
+				return $mimeType;
+			} else if (function_exists("mime_content_type")) {
+				// use mime magic extension if available
+				$mime_type = mime_content_type($this->datadir.$fspath);
+			} else if (OC_Helper::canExecute("file")) {
+				// it looks like we have a 'file' command,
+				// lets see it it does have mime support
+				$fp = popen("file -i -b '{$this->datadir}$fspath' 2>/dev/null", "r");
+				$reply = fgets($fp);
+				pclose($fp);
+
+				//trim the character set from the end of the response
+				$mime_type=substr($reply,0,strrpos($reply,' '));
+			}
+			if (empty($mime_type)) {
+				// Fallback solution: (try to guess the type by the file extension
+				if(!self::$mimetypes){
+					self::$mimetypes=include('mimetypes.list.php');
+				}
+				$extention=strtolower(strrchr(basename($fspath), "."));
+				$extention=substr($extention,1);//remove leading .
+				$mime_type=(isset(self::$mimetypes[$extention]))?self::$mimetypes[$extention]:'application/octet-stream';
+			}
+			return $mime_type;
+		}
+	}
+
+	public function toTmpFile($path){
+		$tmpFolder=sys_get_temp_dir();
+		$filename=tempnam($tmpFolder,'OC_TEMP_FILE_'.substr($path,strrpos($path,'.')));
+		$fileStats = stat($this->datadir.$path);
+		if(copy($this->datadir.$path,$filename)){
+			touch($filename, $fileStats['mtime'], $fileStats['atime']);
+			return $filename;
+		}else{
+			return false;
+		}
+	}
+
+	public function fromTmpFile($tmpFile,$path){
+		$fileStats = stat($tmpFile);
+		if(rename($tmpFile,$this->datadir.$path)){
+			touch($this->datadir.$path, $fileStats['mtime'], $fileStats['atime']);
+			$this->clearFolderSizeCache($path);
+			return true;
+		}else{
+			return false;
+		}
+	}
+
+	public function fromUploadedFile($tmpFile,$path){
+		$fileStats = stat($tmpFile);
+		if(move_uploaded_file($tmpFile,$this->datadir.$path)){
+			touch($this->datadir.$path, $fileStats['mtime'], $fileStats['atime']);
+			$this->clearFolderSizeCache($path);
+			return true;
+		}else{
+			return false;
+		}
+	}
+
+	public function delTree($dir) {
+		$dirRelative=$dir;
+		$dir=$this->datadir.$dir;
+		if (!file_exists($dir)) return true;
+		if (!is_dir($dir) || is_link($dir)) return unlink($dir);
+		foreach (scandir($dir) as $item) {
+			if ($item == '.' || $item == '..') continue;
+			if(is_file($dir.'/'.$item)){
+				if(unlink($dir.'/'.$item)){
+					$this->clearFolderSizeCache($dir);
+				}
+			}elseif(is_dir($dir.'/'.$item)){
+				if (!$this->delTree($dirRelative. "/" . $item)){
+					return false;
+				};
+			}
+		}
+		if($return=rmdir($dir)){
+			$this->clearFolderSizeCache($dir);
+		}
+		return $return;
+	}
+
+	public function find($path){
+		$return=System::find($this->datadir.$path);
+		foreach($return as &$file){
+			$file=str_replace($file,$this->datadir,'');
+		}
+		return $return;
+	}
+
+	public function getTree($dir) {
+		if(substr($dir,-1,1)=='/'){
+			$dir=substr($dir,0,-1);
+		}
+		$tree=array();
+		$tree[]=$dir;
+		$dirRelative=$dir;
+		$dir=$this->datadir.$dir;
+		if (!file_exists($dir)) return true;
+		foreach (scandir($dir) as $item) {
+			if ($item == '.' || $item == '..') continue;
+			if(is_file($dir.'/'.$item)){
+				$tree[]=$dirRelative.'/'.$item;
+			}elseif(is_dir($dir.'/'.$item)){
+				if ($subTree=$this->getTree($dirRelative. "/" . $item)){
+					$tree=array_merge($tree,$subTree);
+				}
+			}
+		}
+		return $tree;
+	}
+
+	public function hash($type,$path,$raw){
+		return hash_file($type,$this->datadir.$path,$raw);
+	}
+
+	public function free_space($path){
+		return disk_free_space($this->datadir.$path);
+	}
+
+	public function search($query){
+		return $this->searchInDir($query);
+	}
+	public function getLocalFile($path){
+			return $this->datadir.$path;
+	}
+
+	private function searchInDir($query,$dir=''){
+		$files=array();
+		foreach (scandir($this->datadir.$dir) as $item) {
+			if ($item == '.' || $item == '..') continue;
+			if(strstr(strtolower($item),strtolower($query))!==false){
+				$files[]=$dir.'/'.$item;
+			}
+			if(is_dir($this->datadir.$dir.'/'.$item)){
+				$files=array_merge($files,$this->searchInDir($query,$dir.'/'.$item));
+			}
+		}
+		return $files;
+	}
+
+	/**
+	 * @brief get the size of folder and it's content
+	 * @param string $path file path
+	 * @return int size of folder and it's content
+	 */
+	public function getFolderSize($path){
+		$path=str_replace('//','/',$path);
+		if($this->is_dir($path) and substr($path,-1)!='/'){
+			$path.='/';
+		}
+		$query=OC_DB::prepare("SELECT size FROM *PREFIX*foldersize WHERE path=?");
+		$size=$query->execute(array($path))->fetchAll();
+		if(count($size)>0){// we already the size, just return it
+			return $size[0]['size'];
+		}else{//the size of the folder isn't know, calulate it
+			return $this->calculateFolderSize($path);
+		}
+	}
+
+	/**
+	 * @brief calulate the size of folder and it's content and cache it
+	 * @param string $path file path
+	 * @return int size of folder and it's content
+	 */
+	public function calculateFolderSize($path){
+		if($this->is_file($path)){
+			$path=dirname($path);
+		}
+		$path=str_replace('//','/',$path);
+		if($this->is_dir($path) and substr($path,-1)!='/'){
+			$path.='/';
+		}
+		$size=0;
+		if ($dh = $this->opendir($path)) {
+			while (($filename = readdir($dh)) !== false) {
+				if($filename!='.' and $filename!='..'){
+					$subFile=$path.'/'.$filename;
+					if($this->is_file($subFile)){
+						$size+=$this->filesize($subFile);
+					}else{
+						$size+=$this->getFolderSize($subFile);
+					}
+				}
+			}
+			if($size>0){
+				$query=OC_DB::prepare("INSERT INTO *PREFIX*foldersize VALUES(?,?)");
+				$result=$query->execute(array($path,$size));
+			}
+		}
+		return $size;
+	}
+
+	/**
+	 * @brief clear the folder size cache of folders containing a file
+	 * @param string $path
+	 */
+	public function clearFolderSizeCache($path){
+		if($this->is_file($path)){
+			$path=dirname($path);
+		}
+		$path=str_replace('//','/',$path);
+		if($this->is_dir($path) and substr($path,-1)!='/'){
+			$path.='/';
+		}
+		$query=OC_DB::prepare("DELETE FROM *PREFIX*foldersize WHERE path = ?");
+		$result=$query->execute(array($path));
+		if($path!='/' and $path!=''){
+			$parts=explode('/',$path);
+			//pop empty part
+			$part=array_pop($parts);
+			if(empty($part)){
+				array_pop($parts);
+			}
+			$parent=implode('/',$parts);
+			$this->clearFolderSizeCache($parent);
+		}
+	}
+}
diff --git a/lib/remotestorage.php b/lib/filestorage/remote.php
index ed90cf1fdaf..fb14c4121a2 100644
--- a/lib/remotestorage.php
+++ b/lib/filestorage/remote.php
@@ -21,8 +21,7 @@
 * 
 */
 
-
-class OC_FILESTORAGE_REMOTE extends OC_FILESTORAGE{
+class OC_Filestorage_Remote extends OC_Filestorage{
 	private $url;
 	private $username;
 	private $password;
@@ -46,7 +45,7 @@ class OC_FILESTORAGE_REMOTE extends OC_FILESTORAGE{
 	}
 	private function connect(){
 		if($this->remote===false){
-			$this->remote=OC_CONNECT::connect($this->url,$this->username,$this->password);
+			$this->remote=OC_Connect::connect($this->url,$this->username,$this->password);
 		}
 	}
 	public function mkdir($path){
@@ -349,5 +348,3 @@ class OC_FILESTORAGE_REMOTE extends OC_FILESTORAGE{
 		}
 	}
 }
-
-?>
diff --git a/lib/filesystem.php b/lib/filesystem.php
index 2c26667bbee..c2153520650 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -24,7 +24,7 @@
 
 /**
  * Class for abstraction of filesystem functions
- * This class won't call any filesystem functions for itself but but will pass them to the correct OC_FILESTORAGE object
+ * This class won't call any filesystem functions for itself but but will pass them to the correct OC_Filestorage object
  * this class should also handle all the file premission related stuff
  *
  * Hooks provided:
@@ -42,7 +42,7 @@
  *
  *   the &run parameter can be set to false to prevent the operation from occuring
  */
-class OC_FILESYSTEM{
+class OC_Filesystem{
 	static private $storages=array();
 	static private $fakeRoot='';
 	static private $storageTypes=array();
@@ -89,7 +89,7 @@ class OC_FILESYSTEM{
 	* create a new storage of a specific type
 	* @param  string  type
 	* @param  array  arguments
-	* @return OC_FILESTORAGE
+	* @return OC_Filestorage
 	*/
 	static public function createStorage($type,$arguments){
 		if(!self::hasStorageType($type)){
@@ -159,8 +159,8 @@ class OC_FILESYSTEM{
 	}
 	
 	/**
-	* mount an OC_FILESTORAGE in our virtual filesystem
-	* @param OC_FILESTORAGE storage
+	* mount an OC_Filestorage in our virtual filesystem
+	* @param OC_Filestorage storage
 	* @param string mountpoint
 	*/
 	static public function mount($storage,$mountpoint){
@@ -173,7 +173,7 @@ class OC_FILESYSTEM{
 	/**
 	* get the storage object for a path
 	* @param string path
-	* @return OC_FILESTORAGE
+	* @return OC_Filestorage
 	*/
 	static public function getStorage($path){
 		$mountpoint=self::getMountPoint($path);
@@ -232,14 +232,14 @@ class OC_FILESYSTEM{
 		$parent=substr($path,0,strrpos($path,'/'));
 		if(self::canWrite($parent) and $storage=self::getStorage($path)){
 			$run=true;
-			OC_HOOK::emit( 'OC_FILESYSTEM', 'create', array( 'path' => $path, 'run' => &$run));
+			OC_Hook::emit( 'OC_Filesystem', 'create', array( 'path' => $path, 'run' => &$run));
 			if($run){
-				OC_HOOK::emit( 'OC_FILESYSTEM', 'write', array( 'path' => $path, 'run' => &$run));
+				OC_Hook::emit( 'OC_Filesystem', 'write', array( 'path' => $path, 'run' => &$run));
 			}
 			if($run){
 				$result=$storage->mkdir(self::getInternalPath($path));
-				OC_HOOK::emit( 'OC_FILESYSTEM', 'post_create', array( 'path' => $path));
-				OC_HOOK::emit( 'OC_FILESYSTEM', 'post_write', array( 'path' => $path));
+				OC_Hook::emit( 'OC_Filesystem', 'post_create', array( 'path' => $path));
+				OC_Hook::emit( 'OC_Filesystem', 'post_write', array( 'path' => $path));
 				return $result;
 			}
 		}
@@ -247,17 +247,17 @@ class OC_FILESYSTEM{
 	static public function rmdir($path){
 		if(self::canWrite($path) and $storage=self::getStorage($path)){
 			$run=true;
-			OC_HOOK::emit( 'OC_FILESYSTEM', 'delete', array( 'path' => $path, 'run' => &$run));
+			OC_Hook::emit( 'OC_Filesystem', 'delete', array( 'path' => $path, 'run' => &$run));
 			if($run){
 				$result=$storage->rmdir(self::getInternalPath($path));
-				OC_HOOK::emit( 'OC_FILESYSTEM', 'post_delete', array( 'path' => $path));
+				OC_Hook::emit( 'OC_Filesystem', 'post_delete', array( 'path' => $path));
 				return $result;
 			}
 		}
 	}
 	static public function opendir($path){
 		if(self::canRead($path) and $storage=self::getStorage($path)){
-			OC_HOOK::emit( 'OC_FILESYSTEM', 'read', array( 'path' => $path));
+			OC_Hook::emit( 'OC_Filesystem', 'read', array( 'path' => $path));
 			return $storage->opendir(self::getInternalPath($path));
 		}
 	}
@@ -294,7 +294,7 @@ class OC_FILESYSTEM{
 	}
 	static public function readfile($path){
 		if(self::canRead($path) and $storage=self::getStorage($path)){
-			OC_HOOK::emit( 'OC_FILESYSTEM', 'read', array( 'path' => $path));
+			OC_Hook::emit( 'OC_Filesystem', 'read', array( 'path' => $path));
 			return $storage->readfile(self::getInternalPath($path));
 		}
 	}
@@ -336,7 +336,7 @@ class OC_FILESYSTEM{
 	}
 	static public function file_get_contents($path){
 		if(self::canRead($path) and $storage=self::getStorage($path)){
-			OC_HOOK::emit( 'OC_FILESYSTEM', 'read', array( 'path' => $path));
+			OC_Hook::emit( 'OC_Filesystem', 'read', array( 'path' => $path));
 			return $storage->file_get_contents(self::getInternalPath($path));
 		}
 	}
@@ -345,17 +345,17 @@ class OC_FILESYSTEM{
 			$run=true;
 			$exists=self::file_exists($path);
 			if(!$exists){
-				OC_HOOK::emit( 'OC_FILESYSTEM', 'create', array( 'path' => $path, 'run' => &$run));
+				OC_Hook::emit( 'OC_Filesystem', 'create', array( 'path' => $path, 'run' => &$run));
 			}
 			if($run){
-				OC_HOOK::emit( 'OC_FILESYSTEM', 'write', array( 'path' => $path, 'run' => &$run));
+				OC_Hook::emit( 'OC_Filesystem', 'write', array( 'path' => $path, 'run' => &$run));
 			}
 			if($run){
 				$result=$storage->file_put_contents(self::getInternalPath($path),$data);
 				if(!$exists){
-					OC_HOOK::emit( 'OC_FILESYSTEM', 'post_create', array( 'path' => $path));
+					OC_Hook::emit( 'OC_Filesystem', 'post_create', array( 'path' => $path));
 				}
-				OC_HOOK::emit( 'OC_FILESYSTEM', 'post_write', array( 'path' => $path));
+				OC_Hook::emit( 'OC_Filesystem', 'post_write', array( 'path' => $path));
 				return $result;
 			}
 		}
@@ -363,10 +363,10 @@ class OC_FILESYSTEM{
 	static public function unlink($path){
 		if(self::canWrite($path) and $storage=self::getStorage($path)){
 			$run=true;
-			OC_HOOK::emit( 'OC_FILESYSTEM', 'delete', array( 'path' => $path, 'run' => &$run));
+			OC_Hook::emit( 'OC_Filesystem', 'delete', array( 'path' => $path, 'run' => &$run));
 			if($run){
 				$result=$storage->unlink(self::getInternalPath($path));
-				OC_HOOK::emit( 'OC_FILESYSTEM', 'post_delete', array( 'path' => $path));
+				OC_Hook::emit( 'OC_Filesystem', 'post_delete', array( 'path' => $path));
 				return $result;
 			}
 		}
@@ -374,7 +374,7 @@ class OC_FILESYSTEM{
 	static public function rename($path1,$path2){
 		if(self::canWrite($path1) and self::canWrite($path2)){
 			$run=true;
-			OC_HOOK::emit( 'OC_FILESYSTEM', 'rename', array( 'oldpath' => $path1 ,'newpath'=>$path2, 'run' => &$run));
+			OC_Hook::emit( 'OC_Filesystem', 'rename', array( 'oldpath' => $path1 ,'newpath'=>$path2, 'run' => &$run));
 			if($run){
 				$mp1=self::getMountPoint($path1);
 				$mp2=self::getMountPoint($path2);
@@ -387,7 +387,7 @@ class OC_FILESYSTEM{
 					$result=$storage2->fromTmpFile($tmpFile,self::getInternalPath($path2));
 					$storage1->unlink(self::getInternalPath($path1));
 				}
-				OC_HOOK::emit( 'OC_FILESYSTEM', 'post_rename', array( 'oldpath' => $path1, 'newpath'=>$path2));
+				OC_Hook::emit( 'OC_Filesystem', 'post_rename', array( 'oldpath' => $path1, 'newpath'=>$path2));
 				return $result;
 			}
 		}
@@ -395,13 +395,13 @@ class OC_FILESYSTEM{
 	static public function copy($path1,$path2){
 		if(self::canRead($path1) and self::canWrite($path2)){
 			$run=true;
-			OC_HOOK::emit( 'OC_FILESYSTEM', 'copy', array( 'oldpath' => $path1 ,'newpath'=>$path2, 'run' => &$run));
+			OC_Hook::emit( 'OC_Filesystem', 'copy', array( 'oldpath' => $path1 ,'newpath'=>$path2, 'run' => &$run));
 			$exists=self::file_exists($path2);
 			if($run and !$exists){
-				OC_HOOK::emit( 'OC_FILESYSTEM', 'create', array( 'path' => $path2, 'run' => &$run));
+				OC_Hook::emit( 'OC_Filesystem', 'create', array( 'path' => $path2, 'run' => &$run));
 			}
 			if($run){
-				OC_HOOK::emit( 'OC_FILESYSTEM', 'write', array( 'path' => $path2, 'run' => &$run));
+				OC_Hook::emit( 'OC_Filesystem', 'write', array( 'path' => $path2, 'run' => &$run));
 			}
 			if($run){
 				$mp1=self::getMountPoint($path1);
@@ -414,11 +414,11 @@ class OC_FILESYSTEM{
 					$tmpFile=$storage1->toTmpFile(self::getInternalPath($path1));
 					$result=$storage2->fromTmpFile($tmpFile,self::getInternalPath($path2));
 				}
-				OC_HOOK::emit( 'OC_FILESYSTEM', 'post_copy', array( 'oldpath' => $path1 ,'newpath'=>$path2));
+				OC_Hook::emit( 'OC_Filesystem', 'post_copy', array( 'oldpath' => $path1 ,'newpath'=>$path2));
 				if(!$exists){
-					OC_HOOK::emit( 'OC_FILESYSTEM', 'post_create', array( 'path' => $path2));
+					OC_Hook::emit( 'OC_Filesystem', 'post_create', array( 'path' => $path2));
 				}
-				OC_HOOK::emit( 'OC_FILESYSTEM', 'post_write', array( 'path' => $path2));
+				OC_Hook::emit( 'OC_Filesystem', 'post_write', array( 'path' => $path2));
 				return $result;
 			}
 		}
@@ -432,13 +432,13 @@ class OC_FILESYSTEM{
 				$write=false;
 				switch($mode){
 					case 'r':
-						OC_HOOK::emit( 'OC_FILESYSTEM', 'read', array( 'path' => $path));
+						OC_Hook::emit( 'OC_Filesystem', 'read', array( 'path' => $path));
 						break;
 					case 'r+':
 					case 'w+':
 					case 'x+':
 					case 'a+':
-						OC_HOOK::emit( 'OC_FILESYSTEM', 'read', array( 'path' => $path));
+						OC_Hook::emit( 'OC_Filesystem', 'read', array( 'path' => $path));
 						$write=true;
 						break;
 					case 'w':
@@ -449,20 +449,20 @@ class OC_FILESYSTEM{
 				}
 				if($write){
 					if(!$exists){
-						OC_HOOK::emit( 'OC_FILESYSTEM', 'create', array( 'path' => $path));
+						OC_Hook::emit( 'OC_Filesystem', 'create', array( 'path' => $path));
 					}
 					if($run){
-						OC_HOOK::emit( 'OC_FILESYSTEM', 'write', array( 'path' => $path, 'run' => &$run));
+						OC_Hook::emit( 'OC_Filesystem', 'write', array( 'path' => $path, 'run' => &$run));
 					}
 				}
 				if($run){
 					$result=$storage->fopen(self::getInternalPath($path),$mode);
 					if($write){
 						if(!$exists){
-							OC_HOOK::emit( 'OC_FILESYSTEM', 'post_create', array( 'path' => $path));
+							OC_Hook::emit( 'OC_Filesystem', 'post_create', array( 'path' => $path));
 						}
 						if($run){
-							OC_HOOK::emit( 'OC_FILESYSTEM', 'post_write', array( 'path' => $path));
+							OC_Hook::emit( 'OC_Filesystem', 'post_write', array( 'path' => $path));
 						}
 					}
 					return $result;
@@ -472,7 +472,7 @@ class OC_FILESYSTEM{
 	}
 	static public function toTmpFile($path){
 		if(self::canRead($path) and $storage=self::getStorage($path)){
-			OC_HOOK::emit( 'OC_FILESYSTEM', 'read', array( 'path' => $path));
+			OC_Hook::emit( 'OC_Filesystem', 'read', array( 'path' => $path));
 			return $storage->toTmpFile(self::getInternalPath($path));
 		}
 	}
@@ -481,17 +481,17 @@ class OC_FILESYSTEM{
 			$run=true;
 			$exists=self::file_exists($path);
 			if(!$exists){
-				OC_HOOK::emit( 'OC_FILESYSTEM', 'create', array( 'path' => $path, 'run' => &$run));
+				OC_Hook::emit( 'OC_Filesystem', 'create', array( 'path' => $path, 'run' => &$run));
 			}
 			if($run){
-				OC_HOOK::emit( 'OC_FILESYSTEM', 'write', array( 'path' => $path, 'run' => &$run));
+				OC_Hook::emit( 'OC_Filesystem', 'write', array( 'path' => $path, 'run' => &$run));
 			}
 			if($run){
 				$result=$storage->fromTmpFile($tmpFile,self::getInternalPath($path));
 				if(!$exists){
-					OC_HOOK::emit( 'OC_FILESYSTEM', 'post_create', array( 'path' => $path));
+					OC_Hook::emit( 'OC_Filesystem', 'post_create', array( 'path' => $path));
 				}
-				OC_HOOK::emit( 'OC_FILESYSTEM', 'post_write', array( 'path' => $path));
+				OC_Hook::emit( 'OC_Filesystem', 'post_write', array( 'path' => $path));
 				return $result;
 			}
 		}
@@ -502,18 +502,18 @@ class OC_FILESYSTEM{
 			$run=true;
 			$exists=self::file_exists($path);
 			if(!$exists){
-				OC_HOOK::emit( 'OC_FILESYSTEM', 'create', array( 'path' => $path, 'run' => &$run));
+				OC_Hook::emit( 'OC_Filesystem', 'create', array( 'path' => $path, 'run' => &$run));
 			}
 			if($run){
-				OC_HOOK::emit( 'OC_FILESYSTEM', 'write', array( 'path' => $path, 'run' => &$run));
+				OC_Hook::emit( 'OC_Filesystem', 'write', array( 'path' => $path, 'run' => &$run));
 			}
 			error_log('upload2');
 			if($run){
 				$result=$storage->fromUploadedFile($tmpFile,self::getInternalPath($path));
 				if(!$exists){
-					OC_HOOK::emit( 'OC_FILESYSTEM', 'post_create', array( 'path' => $path));
+					OC_Hook::emit( 'OC_Filesystem', 'post_create', array( 'path' => $path));
 				}
-				OC_HOOK::emit( 'OC_FILESYSTEM', 'post_write', array( 'path' => $path));
+				OC_Hook::emit( 'OC_Filesystem', 'post_write', array( 'path' => $path));
 				return $result;
 			}
 		}
@@ -526,7 +526,7 @@ class OC_FILESYSTEM{
 	static public function delTree($path){
 		if(self::canWrite($path) and $storage=self::getStorage($path)){
 			$run=true;
-			OC_HOOK::emit( 'OC_FILESYSTEM', 'delete', array( 'path' => $path, 'run' => &$run));
+			OC_Hook::emit( 'OC_Filesystem', 'delete', array( 'path' => $path, 'run' => &$run));
 			if($run){
 				return $storage->delTree(self::getInternalPath($path));
 			}
@@ -561,7 +561,7 @@ class OC_FILESYSTEM{
 	}
 	static public function hash($type,$path,$raw=false){
 		if(self::canRead($path) and $storage=self::getStorage($path)){
-			OC_HOOK::emit( 'OC_FILESYSTEM', 'read', array( 'path' => $path));
+			OC_Hook::emit( 'OC_Filesystem', 'read', array( 'path' => $path));
 			return $storage->hash($type,self::getInternalPath($path),$raw);
 		}
 	}
@@ -589,4 +589,3 @@ class OC_FILESYSTEM{
 		
 	}
 }
-?>
diff --git a/lib/group.php b/lib/group.php
index 6510838ccfc..1161b9035fa 100644
--- a/lib/group.php
+++ b/lib/group.php
@@ -33,7 +33,7 @@
  *   pre_removeFromGroup(&run, uid, gid)
  *   post_removeFromGroup(uid, gid)
  */
-class OC_GROUP {
+class OC_Group {
 	// The backend used for user management
 	private static $_backend;
 
@@ -78,8 +78,7 @@ class OC_GROUP {
 			case 'database':
 			case 'mysql':
 			case 'sqlite':
-				require_once('Group/database.php');
-				self::$_backend = new OC_GROUP_DATABASE();
+				self::$_backend = new OC_Group_Database();
 				break;
 			default:
 				$className = 'OC_GROUP_' . strToUpper($backend);
@@ -114,10 +113,10 @@ class OC_GROUP {
 		}
 
 		$run = true;
-		OC_HOOK::emit( "OC_GROUP", "pre_createGroup", array( "run" => &$run, "gid" => $gid ));
+		OC_Hook::emit( "OC_Group", "pre_createGroup", array( "run" => &$run, "gid" => $gid ));
 
 		if( $run && self::$_backend->createGroup( $gid )){
-			OC_HOOK::emit( "OC_GROUP", "post_createGroup", array( "gid" => $gid ));
+			OC_Hook::emit( "OC_Group", "post_createGroup", array( "gid" => $gid ));
 			return true;
 		}
 		else{
@@ -139,10 +138,10 @@ class OC_GROUP {
 		}
 
 		$run = true;
-		OC_HOOK::emit( "OC_GROUP", "pre_deleteGroup", array( "run" => &$run, "gid" => $gid ));
+		OC_Hook::emit( "OC_Group", "pre_deleteGroup", array( "run" => &$run, "gid" => $gid ));
 
 		if( $run && self::$_backend->deleteGroup( $gid )){
-			OC_HOOK::emit( "OC_GROUP", "post_deleteGroup", array( "gid" => $gid ));
+			OC_Hook::emit( "OC_Group", "post_deleteGroup", array( "gid" => $gid ));
 			return true;
 		}
 		else{
@@ -172,7 +171,7 @@ class OC_GROUP {
 	 */
 	public static function addToGroup( $uid, $gid ){
 		// Does the user exist?
-		if( !in_array( $uid, OC_USER::getUsers())){
+		if( !in_array( $uid, OC_User::getUsers())){
 			return false;
 		}
 		// Does the group exist?
@@ -182,10 +181,10 @@ class OC_GROUP {
 
 		// Go go go
 		$run = true;
-		OC_HOOK::emit( "OC_GROUP", "pre_addToGroup", array( "run" => &$run, "uid" => $uid, "gid" => $gid ));
+		OC_Hook::emit( "OC_Group", "pre_addToGroup", array( "run" => &$run, "uid" => $uid, "gid" => $gid ));
 
 		if( $run && self::$_backend->addToGroup( $uid, $gid )){
-			OC_HOOK::emit( "OC_GROUP", "post_addToGroup", array( "uid" => $uid, "gid" => $gid ));
+			OC_Hook::emit( "OC_Group", "post_addToGroup", array( "uid" => $uid, "gid" => $gid ));
 			return true;
 		}
 		else{
@@ -203,10 +202,10 @@ class OC_GROUP {
 	 */
 	public static function removeFromGroup( $uid, $gid ){
 		$run = true;
-		OC_HOOK::emit( "OC_GROUP", "pre_removeFromGroup", array( "run" => &$run, "uid" => $uid, "gid" => $gid ));
+		OC_Hook::emit( "OC_Group", "pre_removeFromGroup", array( "run" => &$run, "uid" => $uid, "gid" => $gid ));
 
 		if( $run && self::$_backend->removeFromGroup( $uid, $gid )){
-			OC_HOOK::emit( "OC_GROUP", "post_removeFromGroup", array( "uid" => $uid, "gid" => $gid ));
+			OC_Hook::emit( "OC_Group", "post_removeFromGroup", array( "uid" => $uid, "gid" => $gid ));
 			return true;
 		}
 		else{
diff --git a/lib/Group/backend.php b/lib/group/backend.php
index 298cced7ff5..ebee8aacb91 100644
--- a/lib/Group/backend.php
+++ b/lib/group/backend.php
@@ -26,7 +26,7 @@
 /**
  * Abstract base class for user management
  */
-abstract class OC_GROUP_BACKEND {
+abstract class OC_Group_Backend {
 	/**
 	 * @brief Try to create a new group
 	 * @param $gid The name of the group to create
diff --git a/lib/Group/database.php b/lib/group/database.php
index 6e508a4d47c..6ca80b93985 100644
--- a/lib/Group/database.php
+++ b/lib/group/database.php
@@ -37,12 +37,10 @@
  *
  */
 
-require_once( 'Group/backend.php' );
-
 /**
  * Class for group management in a SQL Database (e.g. MySQL, SQLite)
  */
-class OC_GROUP_DATABASE extends OC_GROUP_BACKEND {
+class OC_Group_Database extends OC_Group_Backend {
 	static private $userGroupCache=array();
 
 	/**
diff --git a/lib/helper.php b/lib/helper.php
index ffb25877433..5dc3dd44a15 100755
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -24,7 +24,7 @@
 /**
  * Collection of useful functions
  */
-class OC_HELPER {
+class OC_Helper {
 	/**
 	 * @brief Creates an url
 	 * @param $app app
@@ -318,5 +318,3 @@ class OC_HELPER {
 		return false;
 	}
 }
-
-?>
diff --git a/lib/hook.php b/lib/hook.php
new file mode 100644
index 00000000000..b069a7da6c0
--- /dev/null
+++ b/lib/hook.php
@@ -0,0 +1,69 @@
+<?php
+
+/**
+ * This class manages the hooks. It basically provides two functions: adding
+ * slots and emitting signals.
+ */
+class OC_Hook{
+	static private $registered = array();
+
+	/**
+	 * @brief connects a function to a hook
+	 * @param $signalclass class name of emitter
+	 * @param $signalname name of signal
+	 * @param $slotclass class name of slot
+	 * @param $slotname name of slot
+	 * @returns true/false
+	 *
+	 * This function makes it very easy to connect to use hooks.
+	 *
+	 * TODO: write example
+	 */
+	static public function connect( $signalclass, $signalname, $slotclass, $slotname ){
+		// Cerate the data structure
+		if( !array_key_exists( $signalclass, self::$registered )){
+			self::$registered[$signalclass] = array();
+		}
+		if( !array_key_exists( $signalname, self::$registered[$signalclass] )){
+			self::$registered[$signalclass][$signalname] = array();
+		}
+
+		// register hook
+		self::$registered[$signalclass][$signalname][] = array(
+		  "class" => $slotclass,
+		  "name" => $slotname );
+
+		// No chance for failure ;-)
+		return true;
+	}
+
+	/**
+	 * @brief emitts a signal
+	 * @param $signalclass class name of emitter
+	 * @param $signalname name of signal
+	 * @param $params defautl: array() array with additional data
+	 * @returns true if slots exists or false if not
+	 *
+	 * Emits a signal. To get data from the slot use references!
+	 *
+	 * TODO: write example
+	 */
+	static public function emit( $signalclass, $signalname, $params = array()){
+		// Return false if there are no slots
+		if( !array_key_exists( $signalclass, self::$registered )){
+			return false;
+		}
+		if( !array_key_exists( $signalname, self::$registered[$signalclass] )){
+			return false;
+		}
+
+		// Call all slots
+		foreach( self::$registered[$signalclass][$signalname] as $i ){
+			call_user_func( array( $i["class"], $i["name"] ), $params );
+		}
+
+		// return true
+		return true;
+	}
+}
+ 
diff --git a/lib/installer.php b/lib/installer.php
index a237caa0983..e25f9d9c4ce 100644
--- a/lib/installer.php
+++ b/lib/installer.php
@@ -23,7 +23,7 @@
 /**
  * This class provides the functionality needed to install, update and remove plugins/apps
  */
-class OC_INSTALLER{
+class OC_Installer{
 	/**
 	 * @brief Installs an app
 	 * @param $data array with all information
@@ -88,7 +88,7 @@ class OC_INSTALLER{
 			$zip->close();
 		} else {
 			error_log("Failed to open archive when installing app");
-			OC_HELPER::rmdirr($extractDir);
+			OC_Helper::rmdirr($extractDir);
 			if($data['source']=='http'){
 				unlink($path);
 			}
@@ -98,19 +98,19 @@ class OC_INSTALLER{
 		//load the info.xml file of the app
 		if(!is_file($extractDir.'/appinfo/info.xml')){
 			error_log("App does not provide an info.xml file");
-			OC_HELPER::rmdirr($extractDir);
+			OC_Helper::rmdirr($extractDir);
 			if($data['source']=='http'){
 				unlink($path);
 			}
 			return false;
 		}
-		$info=OC_APP::getAppInfo($extractDir.'/appinfo/info.xml');
+		$info=OC_App::getAppInfo($extractDir.'/appinfo/info.xml');
 		$basedir=$SERVERROOT.'/apps/'.$info['id'];
 		
 		//check if an app with the same id is already installed
 		if(self::isInstalled( $info['id'] )){
 			error_log("App already installed");
-			OC_HELPER::rmdirr($extractDir);
+			OC_Helper::rmdirr($extractDir);
 			if($data['source']=='http'){
 				unlink($path);
 			}
@@ -120,7 +120,7 @@ class OC_INSTALLER{
 		//check if the destination directory already exists
 		if(is_dir($basedir)){
 			error_log("App's directory already exists");
-			OC_HELPER::rmdirr($extractDir);
+			OC_Helper::rmdirr($extractDir);
 			if($data['source']=='http'){
 				unlink($path);
 			}
@@ -134,16 +134,16 @@ class OC_INSTALLER{
 		//copy the app to the correct place
 		if(!mkdir($basedir)){
 			error_log('Can\'t create app folder ('.$basedir.')');
-			OC_HELPER::rmdirr($extractDir);
+			OC_Helper::rmdirr($extractDir);
 			if($data['source']=='http'){
 				unlink($path);
 			}
 			return false;
 		}
-		OC_HELPER::copyr($extractDir,$basedir);
+		OC_Helper::copyr($extractDir,$basedir);
 		
 		//remove temporary files
-		OC_HELPER::rmdirr($extractDir);
+		OC_Helper::rmdirr($extractDir);
 		if($data['source']=='http'){
 			unlink($path);
 		}
@@ -159,8 +159,8 @@ class OC_INSTALLER{
 		}
 		
 		//set the installed version
-		OC_APPCONFIG::setValue($info['id'],'installed_version',$info['version']);
-		OC_APPCONFIG::setValue($info['id'],'enabled','no');
+		OC_Appconfig::setValue($info['id'],'installed_version',$info['version']);
+		OC_Appconfig::setValue($info['id'],'enabled','no');
 		return true;
 	}
 
@@ -173,7 +173,7 @@ class OC_INSTALLER{
 	 */
 	public static function isInstalled( $app ){
 
-		if( null == OC_APPCONFIG::getValue( $app, "installed_version" )){
+		if( null == OC_Appconfig::getValue( $app, "installed_version" )){
 			return false;
 		}
 
@@ -205,7 +205,7 @@ class OC_INSTALLER{
 	 *   -# including appinfo/upgrade.php
 	 *   -# setting the installed version
 	 *
-	 * upgrade.php can determine the current installed version of the app using "OC_APPCONFIG::getValue($appid,'installed_version')"
+	 * upgrade.php can determine the current installed version of the app using "OC_Appconfig::getValue($appid,'installed_version')"
 	 */
 	public static function upgradeApp( $data = array()){
 		// TODO: write function
@@ -251,7 +251,7 @@ class OC_INSTALLER{
 		while( false !== ( $filename = readdir( $dir ))){
 			if( substr( $filename, 0, 1 ) != '.' and is_dir("$SERVERROOT/apps/$filename") ){
 				if( file_exists( "$SERVERROOT/apps/$filename/appinfo/app.php" )){
-					if(!OC_INSTALLER::isInstalled($filename)){
+					if(!OC_Installer::isInstalled($filename)){
 						//install the database
 						if(is_file("$SERVERROOT/apps/$filename/appinfo/database.xml")){
 							OC_DB::createDbFromStructure("$SERVERROOT/apps/$filename/appinfo/database.xml");
@@ -261,12 +261,12 @@ class OC_INSTALLER{
 						if(is_file("$SERVERROOT/apps/$filename/appinfo/install.php")){
 							include("$SERVERROOT/apps/$filename/appinfo/install.php");
 						}
-						$info=OC_APP::getAppInfo("$SERVERROOT/apps/$filename/appinfo/info.xml");
-						OC_APPCONFIG::setValue($filename,'installed_version',$info['version']);
+						$info=OC_App::getAppInfo("$SERVERROOT/apps/$filename/appinfo/info.xml");
+						OC_Appconfig::setValue($filename,'installed_version',$info['version']);
 						if( $enabled ){
-							OC_APPCONFIG::setValue($filename,'enabled','yes');
+							OC_Appconfig::setValue($filename,'enabled','yes');
 						}else{
-							OC_APPCONFIG::setValue($filename,'enabled','no');
+							OC_Appconfig::setValue($filename,'enabled','no');
 						}
 					}
 				}
diff --git a/lib/l10n.php b/lib/l10n.php
index 053c6fbc10e..4e65af66c4f 100644
--- a/lib/l10n.php
+++ b/lib/l10n.php
@@ -200,8 +200,8 @@ class OC_L10N{
 		else{
 			$available=self::findAvailableLanguages( $app );
 		}
-		if( OC_USER::getUser() && OC_PREFERENCES::getValue( OC_USER::getUser(), 'core', 'lang' )){
-			$lang = OC_PREFERENCES::getValue( OC_USER::getUser(), 'core', 'lang' );
+		if( OC_User::getUser() && OC_Preferences::getValue( OC_User::getUser(), 'core', 'lang' )){
+			$lang = OC_Preferences::getValue( OC_User::getUser(), 'core', 'lang' );
 			self::$language = $lang;
 			if( array_search( $lang, $available ) !== false ){
 				return $lang;
diff --git a/lib/log.php b/lib/log.php
index 764c094c919..d51b2ef0785 100644
--- a/lib/log.php
+++ b/lib/log.php
@@ -39,7 +39,7 @@
 /**
  * This class is for logging
  */
-class OC_LOG {
+class OC_Log {
 	/**
 	 * @brief adds an entry to the log
 	 * @param $appid id of the app
@@ -101,7 +101,7 @@ class OC_LOG {
 		$result=$query->execute($params)->fetchAll();
 		if(count($result)>0 and is_numeric($result[0]['moment'])){
 			foreach($result as &$row){
-				$row['moment']=OC_UTIL::formatDate($row['moment']);
+				$row['moment']=OC_Util::formatDate($row['moment']);
 			}
 		}
 		return $result;
@@ -149,7 +149,3 @@ class OC_LOG {
 		return $filteredLogs;
 	}
 }
-
-
-
-?>
diff --git a/lib/mimetypes.list.php b/lib/mimetypes.list.php
index 6d8b3b9abce..24679257199 100644
--- a/lib/mimetypes.list.php
+++ b/lib/mimetypes.list.php
@@ -78,4 +78,3 @@ return array(
 	'webm'=>'video/webm',
 	'wmv'=>'video/x-ms-asf'
 );
-?>
\ No newline at end of file
diff --git a/lib/ocs.php b/lib/ocs.php
index b1be2cb11cf..8c7556a173b 100644
--- a/lib/ocs.php
+++ b/lib/ocs.php
@@ -207,7 +207,7 @@ class OC_OCS {
         $identifieduser='';
       }
     }else{
-      if(!OC_USER::login($authuser,$authpw)){
+      if(!OC_User::login($authuser,$authpw)){
         if($forceuser){
           header('WWW-Authenticate: Basic realm="your valid user account or api key"');
           header('HTTP/1.0 401 Unauthorized');
@@ -377,7 +377,7 @@ class OC_OCS {
    */
   private static function personCheck($format,$login,$passwd) {
     if($login<>''){
-      if(OC_USER::login($login,$passwd)){
+      if(OC_User::login($login,$passwd)){
         $xml['person']['personid']=$login;
         echo(OC_OCS::generatexml($format,'ok',100,'',$xml,'person','check',2));
       }else{
@@ -426,7 +426,7 @@ class OC_OCS {
 
       $xml[$i]['timestamp']=date('c',$log['timestamp']);
       $xml[$i]['type']=1;
-      $xml[$i]['message']=OC_LOG::$TYPE[$log['type']].' '.strip_tags($log['message']);
+      $xml[$i]['message']=OC_Log::$TYPE[$log['type']].' '.strip_tags($log['message']);
       $xml[$i]['link']=$url;
     }
 
@@ -514,19 +514,19 @@ class OC_OCS {
 		if($app){
 			$apps=array($app);
 		}else{
-			$apps=OC_PREFERENCES::getApps($user);
+			$apps=OC_Preferences::getApps($user);
 		}
 		if($key){
 			$keys=array($key);
 		}else{
 			foreach($apps as $app){
-				$keys=OC_PREFERENCES::getKeys($user,$app);
+				$keys=OC_Preferences::getKeys($user,$app);
 			}
 		}
 		$result=array();
 		foreach($apps as $app){
 			foreach($keys as $key){
-				$value=OC_PREFERENCES::getValue($user,$app,$key);
+				$value=OC_Preferences::getValue($user,$app,$key);
 				$result[]=array('app'=>$app,'key'=>$key,'value'=>$value);
 			}
 		}
@@ -542,7 +542,7 @@ class OC_OCS {
 	* @return bool
 	*/
 	public static function setData($user, $app, $key, $value) {
-		return OC_PREFERENCES::setValue($user,$app,$key,$value);
+		return OC_Preferences::setValue($user,$app,$key,$value);
 	}
 
 	/**
@@ -553,8 +553,6 @@ class OC_OCS {
 	* @return string xml/json
 	*/
 	public static function deleteData($user, $app, $key) {
-		return OC_PREFERENCES::deleteKey($user,$app,$key);
+		return OC_Preferences::deleteKey($user,$app,$key);
 	}
 }
-
-?>
diff --git a/lib/ocsclient.php b/lib/ocsclient.php
index cfd529b2ec4..2d85e715090 100644
--- a/lib/ocsclient.php
+++ b/lib/ocsclient.php
@@ -26,7 +26,7 @@
  * database.
  */
 
-class OC_OCSCLIENT{
+class OC_OCSClient{
 
 	/**
 	 * @brief Get all the categories from the OCS server
@@ -160,4 +160,3 @@ class OC_OCSCLIENT{
 
 
 }
-?>
diff --git a/lib/preferences.php b/lib/preferences.php
index 0f4636f6832..d53cdd538e0 100644
--- a/lib/preferences.php
+++ b/lib/preferences.php
@@ -37,7 +37,7 @@
 /**
  * This class provides an easy way for storing user preferences.
  */
-class OC_PREFERENCES{
+class OC_Preferences{
 	/**
 	 * @brief Get all users using the preferences
 	 * @returns array with user ids
@@ -217,4 +217,3 @@ class OC_PREFERENCES{
 		return true;
 	}
 }
-?>
diff --git a/lib/remote/cloud.php b/lib/remote/cloud.php
new file mode 100644
index 00000000000..2d3dee47b1c
--- /dev/null
+++ b/lib/remote/cloud.php
@@ -0,0 +1,206 @@
+<?php
+/**
+ * Class for connection to a remote owncloud installation
+ *
+ */
+class OC_REMOTE_CLOUD{
+	private $path;
+	private $connected=false;
+	private $cookiefile=false;
+
+	/**
+	* make an api call to the remote cloud
+	* @param string $action
+	* @param array parameters
+	* @param bool assoc   when set to true, the result will be parsed as associative array
+	*
+	*/
+	private function apiCall($action,$parameters=false,$assoc=false){
+		if(!$this->cookiefile){
+			$this->cookiefile=sys_get_temp_dir().'/remoteCloudCookie'.uniqid();
+		}
+		$url=$this->path.='/files/api.php';
+		$fields_string="action=$action&";
+		if(is_array($parameters)){
+			foreach($parameters as $key=>$value){
+				$fields_string.=$key.'='.$value.'&';
+			}
+			rtrim($fields_string,'&');
+		}
+		$ch=curl_init();
+		curl_setopt($ch,CURLOPT_URL,$url);
+		curl_setopt($ch,CURLOPT_POST,count($parameters));
+		curl_setopt($ch,CURLOPT_POSTFIELDS,$fields_string);
+		curl_setopt($ch, CURLOPT_COOKIEFILE,$this->cookiefile);
+		curl_setopt($ch, CURLOPT_COOKIEJAR,$this->cookiefile);
+		curl_setopt($ch,CURLOPT_RETURNTRANSFER,true);
+		$result=curl_exec($ch);
+		$result=trim($result);
+		$info=curl_getinfo($ch);
+		$httpCode=$info['http_code'];
+		curl_close($ch);
+		if($httpCode==200 or $httpCode==0){
+			return json_decode($result,$assoc);
+		}else{
+			return false;
+		}
+	}
+
+	public function __construct($path,$user,$password){
+		$this->path=$path;
+		$this->connected=$this->apiCall('login',array('username'=>$user,'password'=>$password));
+	}
+
+	/**
+	* check if we are stull logged in on the remote cloud
+	*
+	*/
+	public function isLoggedIn(){
+		if(!$this->connected){
+			return false;
+		}
+		return $this->apiCall('checklogin');
+	}
+
+	public function __get($name){
+		switch($name){
+			case 'connected':
+				return $this->connected;
+		}
+	}
+
+	/**
+	* disconnect from the remote cloud
+	*
+	*/
+	public function disconnect(){
+		$this->connected=false;
+		if(is_file($this->cookiefile)){
+			unlink($this->cookiefile);
+		}
+		$this->cookiefile=false;
+	}
+
+	/**
+	* create a new file or directory
+	* @param string $dir
+	* @param string $name
+	* @param string $type
+	*/
+	public function newFile($dir,$name,$type){
+		if(!$this->connected){
+			return false;
+		}
+		return $this->apiCall('new',array('dir'=>$dir,'name'=>$name,'type'=>$type),true);
+	}
+
+	/**
+	* deletes a file or directory
+	* @param string $dir
+	* @param string $file
+	*/
+	public function delete($dir,$name){
+		if(!$this->connected){
+			return false;
+		}
+		return $this->apiCall('delete',array('dir'=>$dir,'file'=>$name),true);
+	}
+
+	/**
+	* moves a file or directory
+	* @param string $sorceDir
+	* @param string $sorceFile
+	* @param string $targetDir
+	* @param string $targetFile
+	*/
+	public function move($sourceDir,$sourceFile,$targetDir,$targetFile){
+		if(!$this->connected){
+			return false;
+		}
+		return $this->apiCall('move',array('sourcedir'=>$sourceDir,'source'=>$sourceFile,'targetdir'=>$targetDir,'target'=>$targetFile),true);
+	}
+
+	/**
+	* copies a file or directory
+	* @param string $sorceDir
+	* @param string $sorceFile
+	* @param string $targetDir
+	* @param string $targetFile
+	*/
+	public function copy($sourceDir,$sourceFile,$targetDir,$targetFile){
+		if(!$this->connected){
+			return false;
+		}
+		return $this->apiCall('copy',array('sourcedir'=>$sourceDir,'source'=>$sourceFile,'targetdir'=>$targetDir,'target'=>$targetFile),true);
+	}
+
+	/**
+	* get a file tree
+	* @param string $dir
+	*/
+	public function getTree($dir){
+		if(!$this->connected){
+			return false;
+		}
+		return $this->apiCall('gettree',array('dir'=>$dir),true);
+	}
+
+	/**
+	* get the files inside a directory of the remote cloud
+	* @param string $dir
+	*/
+	public function getFiles($dir){
+		if(!$this->connected){
+			return false;
+		}
+		return $this->apiCall('getfiles',array('dir'=>$dir),true);
+	}
+
+	/**
+	* get a remove file and save it in a temporary file and return the path of the temporary file
+	* @param string $dir
+	* @param string $file
+	* @return string
+	*/
+	public function getFile($dir, $file){
+		if(!$this->connected){
+			return false;
+		}
+		$ch=curl_init();
+		if(!$this->cookiefile){
+			$this->cookiefile=sys_get_temp_dir().'/remoteCloudCookie'.uniqid();
+		}
+		$tmpfile=tempnam(sys_get_temp_dir(),'remoteCloudFile');
+		$fp=fopen($tmpfile,'w+');
+		$url=$this->path.="/files/api.php?action=get&dir=$dir&file=$file";
+		curl_setopt($ch,CURLOPT_URL,$url);
+		curl_setopt($ch, CURLOPT_COOKIEFILE,$this->cookiefile);
+		curl_setopt($ch, CURLOPT_COOKIEJAR,$this->cookiefile);
+		curl_setopt($ch, CURLOPT_FILE, $fp);
+		curl_exec($ch);
+		fclose($fp);
+		curl_close($ch);
+		return $tmpfile;
+	}
+
+	public function sendFile($sourceDir,$sourceFile,$targetDir,$targetFile){
+		global $WEBROOT;
+		$source=$sourceDir.'/'.$sourceFile;
+		$tmp=OC_Filesystem::toTmpFile($source);
+		return $this->sendTmpFile($tmp,$targetDir,$targetFile);
+	}
+
+	public function sendTmpFile($tmp,$targetDir,$targetFile){
+		$token=sha1(uniqid().$tmp);
+		global $WEBROOT;
+		$file=sys_get_temp_dir().'/'.'remoteCloudFile'.$token;
+		rename($tmp,$file);
+		if( OC_Config::getValue( "forcessl", false ) or isset($_SERVER['HTTPS']) and $_SERVER['HTTPS'] == 'on') {
+			$url = "https://". $_SERVER['SERVER_NAME'] . $WEBROOT;
+		}else{
+			$url = "http://". $_SERVER['SERVER_NAME'] . $WEBROOT;
+		}
+		return $this->apiCall('pull',array('dir'=>$targetDir,'file'=>$targetFile,'token'=>$token,'source'=>$url),true);
+	}
+}
+ 
\ No newline at end of file
diff --git a/lib/search.php b/lib/search.php
index ef82e225f3d..f6f805bfe65 100644
--- a/lib/search.php
+++ b/lib/search.php
@@ -24,12 +24,12 @@
 /**
  * provides an interface to all search providers
  */
-class OC_SEARCH{
+class OC_Search{
 	static private $providers=array();
 	
 	/**
 	 * register a new search provider to be used
-	 * @param OC_SearchProvider $provider
+	 * @param OC_Search_Provider $provider
 	 */
 	public static function registerProvider($provider){
 		self::$providers[]=$provider;
@@ -38,7 +38,7 @@ class OC_SEARCH{
 	/**
 	 * search all provider for $query
 	 * @param string query
-	 * @return array An array of OC_SearchResult's
+	 * @return array An array of OC_Search_Result's
 	 */
 	public static function search($query){
 		$results=array();
@@ -48,74 +48,3 @@ class OC_SEARCH{
 		return $results;
 	}
 }
-
-/**
- * provides search functionalty
- */
-abstract class OC_SearchProvider{
-	public function __construct(){
-		OC_SEARCH::registerProvider($this);
-	}
-	
-	/**
-	 * search for $query
-	 * @param string $query
-	 * @return array An array of OC_SearchResult's
-	 */
-	abstract function search($query);
-}
-
-/**
- * a result of a search
- */
-class OC_SearchResult{
-	private $name;
-	private $text;
-	private $link;
-	private $type;
-	
-	/**
-	 * create a new search result
-	 * @param string $name short name for the result
-	 * @param string $text some more information about the result
-	 * @param string $link link for the result
-	 * @param string $type the type of result as human readable string ('File', 'Music', etc)
-	 */
-	public function __construct($name,$text,$link,$type){
-		$this->name=$name;
-		$this->text=$text;
-		$this->link=$link;
-		$this->type=$type;
-	}
-
-	public function __get($name){
-		switch($name){
-			case 'name':
-				return $this->name;
-			case 'text':
-				return $this->text;
-			case 'link':
-				return $this->link;
-			case 'type':
-				return $this->type;
-		}
-	}
-}
-
-class OC_FileSearchProvider extends OC_SearchProvider{
-	function search($query){
-		$files=OC_FILESYSTEM::search($query);
-		$results=array();
-		foreach($files as $file){
-			if(OC_FILESYSTEM::is_dir($file)){
-				$results[]=new OC_SearchResult(basename($file),$file,OC_HELPER::linkTo( 'files', 'index.php?dir='.$file ),'Files');
-			}else{
-				$results[]=new OC_SearchResult(basename($file),$file,OC_HELPER::linkTo( 'files', 'download.php?file='.$file ),'Files');
-			}
-		}
-		return $results;
-	}
-}
-
-new OC_FileSearchProvider();
-?>
\ No newline at end of file
diff --git a/lib/search/provider.php b/lib/search/provider.php
new file mode 100644
index 00000000000..cceed8b04a3
--- /dev/null
+++ b/lib/search/provider.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * provides search functionalty
+ */
+abstract class OC_Search_Provider{
+	public function __construct(){
+		OC_Search::registerProvider($this);
+	}
+
+	/**
+	 * search for $query
+	 * @param string $query
+	 * @return array An array of OC_Search_Result's
+	 */
+	abstract function search($query);
+}
diff --git a/lib/search/provider/file.php b/lib/search/provider/file.php
new file mode 100644
index 00000000000..e257b82a694
--- /dev/null
+++ b/lib/search/provider/file.php
@@ -0,0 +1,16 @@
+<?php
+
+class OC_Search_Provider_File extends OC_Search_Provider{
+	function search($query){
+		$files=OC_Filesystem::search($query);
+		$results=array();
+		foreach($files as $file){
+			if(OC_Filesystem::is_dir($file)){
+				$results[]=new OC_Search_Result(basename($file),$file,OC_Helper::linkTo( 'files', 'index.php?dir='.$file ),'Files');
+			}else{
+				$results[]=new OC_Search_Result(basename($file),$file,OC_Helper::linkTo( 'files', 'download.php?file='.$file ),'Files');
+			}
+		}
+		return $results;
+	}
+}
diff --git a/lib/search/result.php b/lib/search/result.php
new file mode 100644
index 00000000000..cd78a5cf253
--- /dev/null
+++ b/lib/search/result.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * a result of a search
+ */
+class OC_Search_Result{
+	public $name;
+	public $text;
+	public $link;
+	public $type;
+
+	/**
+	 * create a new search result
+	 * @param string $name short name for the result
+	 * @param string $text some more information about the result
+	 * @param string $link link for the result
+	 * @param string $type the type of result as human readable string ('File', 'Music', etc)
+	 */
+	public function __construct($name,$text,$link,$type){
+		$this->name=$name;
+		$this->text=$text;
+		$this->link=$link;
+		$this->type=$type;
+	}
+}
diff --git a/lib/setup.php b/lib/setup.php
index f9bc6fd1bdd..41cfa1750ab 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -1,10 +1,8 @@
 <?php
 
-include_once( 'installer.php' );
-
 $hasSQLite = (is_callable('sqlite_open') or class_exists('SQLite3'));
 $hasMySQL = is_callable('mysql_connect');
-$datadir = OC_CONFIG::getValue('datadir', $SERVERROOT.'/data');
+$datadir = OC_Config::getValue('datadir', $SERVERROOT.'/data');
 $opts = array(
 	'hasSQLite' => $hasSQLite,
 	'hasMySQL' => $hasMySQL,
@@ -14,13 +12,13 @@ $opts = array(
 
 if(isset($_POST['install']) AND $_POST['install']=='true') {
 	// We have to launch the installation process :
-	$e = OC_SETUP::install($_POST);
+	$e = OC_Setup::install($_POST);
 	$errors = array('errors' => $e);
 	
 	if(count($e) > 0) {
-		//OC_TEMPLATE::printGuestPage("", "error", array("errors" => $errors));
+		//OC_Template::printGuestPage("", "error", array("errors" => $errors));
 		$options = array_merge($_POST, $opts, $errors);
-		OC_TEMPLATE::printGuestPage("", "installation", $options);
+		OC_Template::printGuestPage("", "installation", $options);
 	}
 	else {
 		header("Location: ".$WEBROOT.'/');
@@ -28,10 +26,10 @@ if(isset($_POST['install']) AND $_POST['install']=='true') {
 	}
 }
 else {
-	OC_TEMPLATE::printGuestPage("", "installation", $opts);
+	OC_Template::printGuestPage("", "installation", $opts);
 }
 
-class OC_SETUP {
+class OC_Setup {
 	public static function install($options) {
 		$error = array();
 		$dbtype = $options['dbtype'];
@@ -74,18 +72,18 @@ class OC_SETUP {
 			}
 
 			//write the config file
-			OC_CONFIG::setValue('datadirectory', $datadir);
- 			OC_CONFIG::setValue('dbtype', $dbtype);
- 			OC_CONFIG::setValue('version',implode('.',OC_UTIL::getVersion()));
+			OC_Config::setValue('datadirectory', $datadir);
+ 			OC_Config::setValue('dbtype', $dbtype);
+ 			OC_Config::setValue('version',implode('.',OC_Util::getVersion()));
 			if($dbtype == 'mysql') {
 				$dbuser = $options['dbuser'];
 				$dbpass = $options['dbpass'];
 				$dbname = $options['dbname'];
 				$dbhost = $options['dbhost'];
 				$dbtableprefix = $options['dbtableprefix'];
-				OC_CONFIG::setValue('dbname', $dbname);
-				OC_CONFIG::setValue('dbhost', $dbhost);
-				OC_CONFIG::setValue('dbtableprefix', $dbtableprefix);
+				OC_Config::setValue('dbname', $dbname);
+				OC_Config::setValue('dbhost', $dbhost);
+				OC_Config::setValue('dbtableprefix', $dbtableprefix);
 
 				//check if the database user has admin right
 				$connection = @mysql_connect($dbhost, $dbuser, $dbpass);
@@ -107,15 +105,15 @@ class OC_SETUP {
 						
 						self::createDBUser($dbusername, $dbpassword, $connection);
 						
-						OC_CONFIG::setValue('dbuser', $dbusername);
-						OC_CONFIG::setValue('dbpassword', $dbpassword);
+						OC_Config::setValue('dbuser', $dbusername);
+						OC_Config::setValue('dbpassword', $dbpassword);
 
 						//create the database
 						self::createDatabase($dbname, $dbusername, $connection);
 					}
 					else {
-						OC_CONFIG::setValue('dbuser', $dbuser);
-						OC_CONFIG::setValue('dbpassword', $dbpass);
+						OC_Config::setValue('dbuser', $dbuser);
+						OC_Config::setValue('dbpassword', $dbpass);
 
 						//create the database
 						self::createDatabase($dbname, $dbuser, $connection);
@@ -141,18 +139,18 @@ class OC_SETUP {
 
 			if(count($error) == 0) {
 				//create the user and group
-				OC_USER::createUser($username, $password);
-				OC_GROUP::createGroup('admin');
-				OC_GROUP::addToGroup($username, 'admin');
+				OC_User::createUser($username, $password);
+				OC_Group::createGroup('admin');
+				OC_Group::addToGroup($username, 'admin');
 
 				//guess what this does
-				OC_INSTALLER::installShippedApps(true);
+				OC_Installer::installShippedApps(true);
 
 				//create htaccess files for apache hosts
 				self::createHtaccess(); //TODO detect if apache is used
 
 				//and we are done
-				OC_CONFIG::setValue('installed', true);
+				OC_Config::setValue('installed', true);
 			}
 		}
 
@@ -195,7 +193,7 @@ class OC_SETUP {
 		@file_put_contents($SERVERROOT.'/.htaccess', $content); //supress errors in case we don't have permissions for it
 
 		$content = "deny from all";
-		file_put_contents(OC_CONFIG::getValue('datadirectory', $SERVERROOT.'/data').'/.htaccess', $content);
+		file_put_contents(OC_Config::getValue('datadirectory', $SERVERROOT.'/data').'/.htaccess', $content);
 	}
 }
 
diff --git a/lib/template.php b/lib/template.php
index 99099d49d0f..fe173f609b2 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -22,49 +22,49 @@
  */
 
 /**
- * @brief make OC_HELPER::linkTo available as a simple function
+ * @brief make OC_Helper::linkTo available as a simple function
  * @param $app app
  * @param $file file
  * @returns link to the file
  *
- * For further information have a look at OC_HELPER::linkTo
+ * For further information have a look at OC_Helper::linkTo
  */
 function link_to( $app, $file ){
-	return OC_HELPER::linkTo( $app, $file );
+	return OC_Helper::linkTo( $app, $file );
 }
 
 /**
- * @brief make OC_HELPER::imagePath available as a simple function
+ * @brief make OC_Helper::imagePath available as a simple function
  * @param $app app
  * @param $image image
  * @returns link to the image
  *
- * For further information have a look at OC_HELPER::imagePath
+ * For further information have a look at OC_Helper::imagePath
  */
 function image_path( $app, $image ){
-	return OC_HELPER::imagePath( $app, $image );
+	return OC_Helper::imagePath( $app, $image );
 }
 
 /**
- * @brief make OC_HELPER::mimetypeIcon available as a simple function
+ * @brief make OC_Helper::mimetypeIcon available as a simple function
  * @param $mimetype mimetype
  * @returns link to the image
  *
- * For further information have a look at OC_HELPER::mimetypeIcon
+ * For further information have a look at OC_Helper::mimetypeIcon
  */
 function mimetype_icon( $mimetype ){
-	return OC_HELPER::mimetypeIcon( $mimetype );
+	return OC_Helper::mimetypeIcon( $mimetype );
 }
 
 /**
- * @brief make OC_HELPER::humanFileSize available as a simple function
+ * @brief make OC_Helper::humanFileSize available as a simple function
  * @param $bytes size in bytes
  * @returns size as string
  *
- * For further information have a look at OC_HELPER::humanFileSize
+ * For further information have a look at OC_Helper::humanFileSize
  */
 function human_file_size( $bytes ){
-	return OC_HELPER::humanFileSize( $bytes );
+	return OC_Helper::humanFileSize( $bytes );
 }
 
 function simple_file_size($bytes) {
@@ -101,7 +101,7 @@ function relative_modified_date($timestamp) {
 /**
  * This class provides the templates for owncloud.
  */
-class OC_TEMPLATE{
+class OC_Template{
 	private $renderas; // Create a full page?
 	private $application; // template Application
 	private $vars; // Vars
@@ -114,11 +114,11 @@ class OC_TEMPLATE{
 	 * @param $app app providing the template
 	 * @param $file name of the tempalte file (without suffix)
 	 * @param $renderas = ""; produce a full page
-	 * @returns OC_TEMPLATE object
+	 * @returns OC_Template object
 	 *
-	 * This function creates an OC_TEMPLATE object.
+	 * This function creates an OC_Template object.
 	 *
-	 * If $renderas is set, OC_TEMPLATE will try to produce a full page in the
+	 * If $renderas is set, OC_Template will try to produce a full page in the
 	 * according layout. For now, renderas can be set to "guest", "user" or
 	 * "admin".
 	 */
@@ -233,34 +233,34 @@ class OC_TEMPLATE{
 			// Decide which page we show
 			if( $this->renderas == "user" )
 			{
-				$page = new OC_TEMPLATE( "core", "layout.user" );
-				$search=new OC_TEMPLATE( 'core', 'part.searchbox');
-				$search->assign('searchurl',OC_HELPER::linkTo( 'search', 'index.php' ));
+				$page = new OC_Template( "core", "layout.user" );
+				$search=new OC_Template( 'core', 'part.searchbox');
+				$search->assign('searchurl',OC_Helper::linkTo( 'search', 'index.php' ));
 				$page->assign('searchbox', $search->fetchPage());
 
 				// Add navigation entry
-				$page->assign( "navigation", OC_APP::getNavigation());
+				$page->assign( "navigation", OC_App::getNavigation());
 			}
 			elseif( $this->renderas == "admin" )
 			{
-				$page = new OC_TEMPLATE( "core", "layout.admin" );
-				$search=new OC_TEMPLATE( 'core', 'part.searchbox');
-				$search->assign('searchurl',OC_HELPER::linkTo( 'search', 'index.php' ));
+				$page = new OC_Template( "core", "layout.admin" );
+				$search=new OC_Template( 'core', 'part.searchbox');
+				$search->assign('searchurl',OC_Helper::linkTo( 'search', 'index.php' ));
 				$page->assign('searchbox', $search->fetchPage());
 				
 				// Add menu data
-				if( OC_GROUP::inGroup( $_SESSION["user_id"], "admin" )){
-					$page->assign( "adminnavigation", OC_APP::getAdminNavigation());
+				if( OC_Group::inGroup( $_SESSION["user_id"], "admin" )){
+					$page->assign( "adminnavigation", OC_App::getAdminNavigation());
 				}
-				$page->assign( "settingsnavigation", OC_APP::getSettingsNavigation());
+				$page->assign( "settingsnavigation", OC_App::getSettingsNavigation());
 			}
 			else
 			{
-				$page = new OC_TEMPLATE( "core", "layout.guest" );
+				$page = new OC_Template( "core", "layout.guest" );
 			}
 
 			// Add the css and js files
-			foreach(OC_UTIL::$scripts as $script){
+			foreach(OC_Util::$scripts as $script){
 				if(is_file("$SERVERROOT/apps/$script.js" )){
 					$page->append( "jsfiles", "$WEBROOT/apps/$script.js" );
 				}
@@ -271,7 +271,7 @@ class OC_TEMPLATE{
 					$page->append( "jsfiles", "$WEBROOT/core/$script.js" );
 				}
 			}
-			foreach(OC_UTIL::$styles as $style){
+			foreach(OC_Util::$styles as $style){
 				if(is_file("$SERVERROOT/apps/$style.css" )){
 					$page->append( "cssfiles", "$WEBROOT/apps/$style.css" );
 				}
@@ -285,7 +285,7 @@ class OC_TEMPLATE{
 			
 			// Add custom headers
 			$page->assign('headers',$this->headers);
-			foreach(OC_UTIL::$headers as $header){
+			foreach(OC_Util::$headers as $header){
 				$page->append('headers',$header);
 			}
 			
@@ -328,7 +328,7 @@ class OC_TEMPLATE{
 	 * @returns true/false
 	 */
 	public static function printUserPage( $application, $name, $parameters = array() ){
-		$content = new OC_TEMPLATE( $application, $name, "user" );
+		$content = new OC_Template( $application, $name, "user" );
 		foreach( $parameters as $key => $value ){
 			$content->assign( $key, $value );
 		}
@@ -343,7 +343,7 @@ class OC_TEMPLATE{
 	 * @returns true/false
 	 */
 	public static function printAdminPage( $application, $name, $parameters = array() ){
-		$content = new OC_TEMPLATE( $application, $name, "admin" );
+		$content = new OC_Template( $application, $name, "admin" );
 		foreach( $parameters as $key => $value ){
 			$content->assign( $key, $value );
 		}
@@ -358,12 +358,10 @@ class OC_TEMPLATE{
 	 * @returns true/false
 	 */
 	public static function printGuestPage( $application, $name, $parameters = array() ){
-		$content = new OC_TEMPLATE( $application, $name, "guest" );
+		$content = new OC_Template( $application, $name, "guest" );
 		foreach( $parameters as $key => $value ){
 			$content->assign( $key, $value );
 		}
 		return $content->printPage();
 	}
 }
-
-?>
diff --git a/lib/user.php b/lib/user.php
index a64ce05f2c9..9b8f5fb13e7 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -20,10 +20,6 @@
  *
  */
 
-if( !OC_CONFIG::getValue( "installed", false )){
-	$_SESSION['user_id'] = '';
-}
-
 /**
  * This class provides all methods for user management.
  *
@@ -38,7 +34,7 @@ if( !OC_CONFIG::getValue( "installed", false )){
  *   post_login(uid)
  *   logout()
  */
-class OC_USER {
+class OC_User {
 	// The backend used for user management
 	private static $_usedBackends = array();
 
@@ -95,8 +91,7 @@ class OC_USER {
 			case 'database':
 			case 'mysql':
 			case 'sqlite':
-				require_once('User/database.php');
-				self::$_usedBackends[$backend] = new OC_USER_DATABASE();
+				self::$_usedBackends[$backend] = new OC_User_Database();
 				break;
 			default:
 				$className = 'OC_USER_' . strToUpper($backend);
@@ -113,7 +108,7 @@ class OC_USER {
 	 * @param $password The password of the new user
 	 * @returns true/false
 	 *
-	 * Creates a new user. Basic checking of username is done in OC_USER
+	 * Creates a new user. Basic checking of username is done in OC_User
 	 * itself, not in its subclasses.
 	 *
 	 * Allowed characters in the username are: "a-z", "A-Z", "0-9" and "_.@-"
@@ -135,7 +130,7 @@ class OC_USER {
 
 
 		$run = true;
-		OC_HOOK::emit( "OC_USER", "pre_createUser", array( "run" => &$run, "uid" => $uid, "password" => $password ));
+		OC_Hook::emit( "OC_User", "pre_createUser", array( "run" => &$run, "uid" => $uid, "password" => $password ));
 
 		if( $run ){
 			//create the user in the first backend that supports creating users
@@ -144,7 +139,7 @@ class OC_USER {
 					continue;
 
 				$backend->createUser($uid,$password);
-				OC_HOOK::emit( "OC_USER", "post_createUser", array( "uid" => $uid, "password" => $password ));
+				OC_Hook::emit( "OC_User", "post_createUser", array( "uid" => $uid, "password" => $password ));
 
 				return true;
 			}
@@ -161,7 +156,7 @@ class OC_USER {
 	 */
 	public static function deleteUser( $uid ){
 		$run = true;
-		OC_HOOK::emit( "OC_USER", "pre_deleteUser", array( "run" => &$run, "uid" => $uid ));
+		OC_Hook::emit( "OC_User", "pre_deleteUser", array( "run" => &$run, "uid" => $uid ));
 
 		if( $run ){
 			//delete the user from all backends
@@ -171,12 +166,12 @@ class OC_USER {
 				}
 			}
 			// We have to delete the user from all groups
-			foreach( OC_GROUP::getUserGroups( $uid ) as $i ){
-				OC_GROUP::removeFromGroup( $uid, $i );
+			foreach( OC_Group::getUserGroups( $uid ) as $i ){
+				OC_Group::removeFromGroup( $uid, $i );
 			}
 
 			// Emit and exit
-			OC_HOOK::emit( "OC_USER", "post_deleteUser", array( "uid" => $uid ));
+			OC_Hook::emit( "OC_User", "post_deleteUser", array( "uid" => $uid ));
 			return true;
 		}
 		else{
@@ -194,12 +189,12 @@ class OC_USER {
 	 */
 	public static function login( $uid, $password ){
 		$run = true;
-		OC_HOOK::emit( "OC_USER", "pre_login", array( "run" => &$run, "uid" => $uid ));
+		OC_Hook::emit( "OC_User", "pre_login", array( "run" => &$run, "uid" => $uid ));
 
 		if( $run && self::checkPassword( $uid, $password )){
 			$_SESSION['user_id'] = $uid;
-			OC_LOG::add( "core", $_SESSION['user_id'], "login" );
-			OC_HOOK::emit( "OC_USER", "post_login", array( "uid" => $uid ));
+			OC_Log::add( "core", $_SESSION['user_id'], "login" );
+			OC_Hook::emit( "OC_User", "post_login", array( "uid" => $uid ));
 			return true;
 		}
 		else{
@@ -214,8 +209,8 @@ class OC_USER {
 	 * Logout, destroys session
 	 */
 	public static function logout(){
-		OC_HOOK::emit( "OC_USER", "logout", array());
-		OC_LOG::add( "core", $_SESSION['user_id'], "logout" );
+		OC_Hook::emit( "OC_User", "logout", array());
+		OC_Log::add( "core", $_SESSION['user_id'], "logout" );
 		$_SESSION['user_id'] = false;
 		return true;
 	}
@@ -268,7 +263,7 @@ class OC_USER {
 	 */
 	public static function setPassword( $uid, $password ){
 		$run = true;
-		OC_HOOK::emit( "OC_USER", "pre_setPassword", array( "run" => &$run, "uid" => $uid, "password" => $password ));
+		OC_Hook::emit( "OC_User", "pre_setPassword", array( "run" => &$run, "uid" => $uid, "password" => $password ));
 
 		if( $run ){
 			foreach(self::$_usedBackends as $backend){
@@ -278,7 +273,7 @@ class OC_USER {
 					}
 				}
 			}
-			OC_HOOK::emit( "OC_USER", "post_setPassword", array( "uid" => $uid, "password" => $password ));
+			OC_Hook::emit( "OC_User", "post_setPassword", array( "uid" => $uid, "password" => $password ));
 			return true;
 		}
 		else{
diff --git a/lib/User/backend.php b/lib/user/backend.php
index 1797d0c475a..4afdf152150 100644
--- a/lib/User/backend.php
+++ b/lib/user/backend.php
@@ -41,9 +41,9 @@ define('OC_USER_BACKEND_USER_EXISTS',       0x100000);
 
 /**
  * abstract base class for user management
- * subclass this for your own backends and see OC_USER_EXAMPLE for descriptions
+ * subclass this for your own backends and see OC_User_Example for descriptions
  */
-abstract class OC_USER_BACKEND {
+abstract class OC_User_Backend {
 
 	protected $possibleActions = array(
 		OC_USER_BACKEND_CREATE_USER => 'createUser',
diff --git a/lib/User/database.php b/lib/user/database.php
index 0396ac30958..4992c2aa164 100644
--- a/lib/User/database.php
+++ b/lib/user/database.php
@@ -33,12 +33,10 @@
  *
  */
 
-require_once('User/backend.php');
-
 /**
  * Class for user management in a SQL Database (e.g. MySQL, SQLite)
  */
-class OC_USER_DATABASE extends OC_USER_BACKEND {
+class OC_User_Database extends OC_User_Backend {
 	static private $userGroupCache=array();
 
 	/**
@@ -47,7 +45,7 @@ class OC_USER_DATABASE extends OC_USER_BACKEND {
 	 * @param $password The password of the new user
 	 * @returns true/false
 	 *
-	 * Creates a new user. Basic checking of username is done in OC_USER
+	 * Creates a new user. Basic checking of username is done in OC_User
 	 * itself, not in its subclasses.
 	 */
 	public function createUser( $uid, $password ){
diff --git a/lib/User/example.php b/lib/user/example.php
index 4abc1b3d49c..7481014de77 100644
--- a/lib/User/example.php
+++ b/lib/user/example.php
@@ -21,20 +21,18 @@
  *
  */
 
-require_once('User/backend.php');
-
 /**
  * abstract reference class for user management
  * this class should only be used as a reference for method signatures and their descriptions
  */
-abstract class OC_USER_EXAMPLE extends OC_USER_BACKEND {
+abstract class OC_User_Example extends OC_User_Backend {
 	/**
 		* @brief Create a new user
 		* @param $uid The username of the user to create
 		* @param $password The password of the new user
 		* @returns true/false
 		*
-		* Creates a new user. Basic checking of username is done in OC_USER
+		* Creates a new user. Basic checking of username is done in OC_User
 		* itself, not in its subclasses.
 		*/
 	public function createUser($uid, $password){
diff --git a/lib/util.php b/lib/util.php
new file mode 100644
index 00000000000..3e2e4fa34e4
--- /dev/null
+++ b/lib/util.php
@@ -0,0 +1,248 @@
+<?php
+
+/**
+ * Class for utility functions
+ *
+ */
+class OC_Util {
+	public static $scripts=array();
+	public static $styles=array();
+	public static $headers=array();
+	private static $fsSetup=false;
+
+	// Can be set up
+	public static function setupFS( $user = "", $root = "files" ){// configure the initial filesystem based on the configuration
+		if(self::$fsSetup){//setting up the filesystem twice can only lead to trouble
+			return false;
+		}
+
+		// Global Variables
+		global $SERVERROOT;
+		global $CONFIG_DATADIRECTORY;
+
+		$CONFIG_DATADIRECTORY_ROOT = OC_Config::getValue( "datadirectory", "$SERVERROOT/data" );
+		$CONFIG_BACKUPDIRECTORY = OC_Config::getValue( "backupdirectory", "$SERVERROOT/backup" );
+
+		// Create root dir
+		if(!is_dir($CONFIG_DATADIRECTORY_ROOT)){
+			@mkdir($CONFIG_DATADIRECTORY_ROOT) or die("Can't create data directory ($CONFIG_DATADIRECTORY_ROOT), you can usually fix this by setting the owner of '$SERVERROOT' to the user that the web server uses (www-data for debian/ubuntu)");
+		}
+
+		// If we are not forced to load a specific user we load the one that is logged in
+		if( $user == "" && OC_User::isLoggedIn()){
+			$user = OC_User::getUser();
+		}
+
+		if( $user != "" ){ //if we aren't logged in, there is no use to set up the filesystem
+			//first set up the local "root" storage and the backupstorage if needed
+			$rootStorage=OC_Filesystem::createStorage('local',array('datadir'=>$CONFIG_DATADIRECTORY_ROOT));
+// 			if( OC_Config::getValue( "enablebackup", false )){
+// 				// This creates the Directorys recursively
+// 				if(!is_dir( "$CONFIG_BACKUPDIRECTORY/$user/$root" )){
+// 					mkdir( "$CONFIG_BACKUPDIRECTORY/$user/$root", 0755, true );
+// 				}
+// 				$backupStorage=OC_Filesystem::createStorage('local',array('datadir'=>$CONFIG_BACKUPDIRECTORY));
+// 				$backup=new OC_FILEOBSERVER_BACKUP(array('storage'=>$backupStorage));
+// 				$rootStorage->addObserver($backup);
+// 			}
+			OC_Filesystem::mount($rootStorage,'/');
+
+			// TODO add this storage provider in a proper way
+			$sharedStorage = OC_Filesystem::createStorage('shared',array('datadir'=>'/'.OC_User::getUser().'/files/Share/'));
+			OC_Filesystem::mount($sharedStorage,'/'.OC_User::getUser().'/files/Share/');
+
+			$CONFIG_DATADIRECTORY = "$CONFIG_DATADIRECTORY_ROOT/$user/$root";
+			if( !is_dir( $CONFIG_DATADIRECTORY )){
+				mkdir( $CONFIG_DATADIRECTORY, 0755, true );
+			}
+
+// TODO: find a cool way for doing this
+// 			//set up the other storages according to the system settings
+// 			foreach($CONFIG_FILESYSTEM as $storageConfig){
+// 				if(OC_Filesystem::hasStorageType($storageConfig['type'])){
+// 					$arguments=$storageConfig;
+// 					unset($arguments['type']);
+// 					unset($arguments['mountpoint']);
+// 					$storage=OC_Filesystem::createStorage($storageConfig['type'],$arguments);
+// 					if($storage){
+// 						OC_Filesystem::mount($storage,$storageConfig['mountpoint']);
+// 					}
+// 				}
+// 			}
+
+			//jail the user into his "home" directory
+			OC_Filesystem::chroot("/$user/$root");
+			self::$fsSetup=true;
+		}
+	}
+
+	public static function tearDownFS(){
+		OC_Filesystem::tearDown();
+		self::$fsSetup=false;
+	}
+
+	/**
+	 * get the current installed version of ownCloud
+	 * @return array
+	 */
+	public static function getVersion(){
+		return array(1,90,0);
+	}
+
+	/**
+	 * add a javascript file
+	 *
+	 * @param url  $url
+	 */
+	public static function addScript( $application, $file = null ){
+		if( is_null( $file )){
+			$file = $application;
+			$application = "";
+		}
+		if( !empty( $application )){
+			self::$scripts[] = "$application/js/$file";
+		}else{
+			self::$scripts[] = "js/$file";
+		}
+	}
+
+	/**
+	 * add a css file
+	 *
+	 * @param url  $url
+	 */
+	public static function addStyle( $application, $file = null ){
+		if( is_null( $file )){
+			$file = $application;
+			$application = "";
+		}
+		if( !empty( $application )){
+			self::$styles[] = "$application/css/$file";
+		}else{
+			self::$styles[] = "css/$file";
+		}
+	}
+
+	/**
+	 * @brief Add a custom element to the header
+	 * @param string tag tag name of the element
+	 * @param array $attributes array of attrobutes for the element
+	 * @param string $text the text content for the element
+	 */
+	public static function addHeader( $tag, $attributes, $text=''){
+		self::$headers[]=array('tag'=>$tag,'attributes'=>$attributes,'text'=>$text);
+	}
+
+       /**
+         * formats a timestamp in the "right" way
+         *
+         * @param int timestamp $timestamp
+         * @param bool dateOnly option to ommit time from the result
+         */
+        public static function formatDate( $timestamp,$dateOnly=false){
+			if(isset($_SESSION['timezone'])){//adjust to clients timezone if we know it
+				$systemTimeZone = intval(exec('date +%z'));
+				$systemTimeZone=(round($systemTimeZone/100,0)*60)+($systemTimeZone%100);
+				$clientTimeZone=$_SESSION['timezone']*60;
+				$offset=$clientTimeZone-$systemTimeZone;
+				$timestamp=$timestamp+$offset*60;
+			}
+			$timeformat=$dateOnly?'F j, Y':'F j, Y, H:i';
+			return date($timeformat,$timestamp);
+        }
+
+	/**
+	 * Shows a pagenavi widget where you can jump to different pages.
+	 *
+	 * @param int $pagecount
+	 * @param int $page
+	 * @param string $url
+	 * @return OC_Template
+	 */
+	public static function getPageNavi($pagecount,$page,$url) {
+
+		$pagelinkcount=8;
+		if ($pagecount>1) {
+			$pagestart=$page-$pagelinkcount;
+			if($pagestart<0) $pagestart=0;
+			$pagestop=$page+$pagelinkcount;
+			if($pagestop>$pagecount) $pagestop=$pagecount;
+
+			$tmpl = new OC_Template( '', 'part.pagenavi', '' );
+			$tmpl->assign('page',$page);
+			$tmpl->assign('pagecount',$pagecount);
+			$tmpl->assign('pagestart',$pagestart);
+			$tmpl->assign('pagestop',$pagestop);
+			$tmpl->assign('url',$url);
+			return $tmpl;
+		}
+	}
+
+
+
+	/**
+	 * check if the current server configuration is suitable for ownCloud
+	 * @return array arrays with error messages and hints
+	 */
+	public static function checkServer(){
+		global $SERVERROOT;
+		global $CONFIG_DATADIRECTORY;
+
+		$CONFIG_DATADIRECTORY_ROOT = OC_Config::getValue( "datadirectory", "$SERVERROOT/data" );;
+		$CONFIG_BACKUPDIRECTORY = OC_Config::getValue( "backupdirectory", "$SERVERROOT/backup" );
+		$CONFIG_INSTALLED = OC_Config::getValue( "installed", false );
+		$errors=array();
+
+		//check for database drivers
+		if(!is_callable('sqlite_open') and !is_callable('mysql_connect')){
+			$errors[]=array('error'=>'No database drivers (sqlite or mysql) installed.<br/>','hint'=>'');//TODO: sane hint
+		}
+		$CONFIG_DBTYPE = OC_Config::getValue( "dbtype", "sqlite" );
+		$CONFIG_DBNAME = OC_Config::getValue( "dbname", "owncloud" );
+
+		//try to get the username the httpd server runs on, used in hints
+		$stat=stat($_SERVER['DOCUMENT_ROOT']);
+		if(is_callable('posix_getpwuid')){
+			$serverUser=posix_getpwuid($stat['uid']);
+			$serverUser='\''.$serverUser['name'].'\'';
+		}else{
+			$serverUser='\'www-data\' for ubuntu/debian';//TODO: try to detect the distro and give a guess based on that
+		}
+
+		//common hint for all file permissons error messages
+		$permissionsHint="Permissions can usually be fixed by setting the owner of the file or directory to the user the web server runs as ($serverUser)";
+
+		//check for correct file permissions
+		if(!stristr(PHP_OS, 'WIN')){
+			$prems=substr(decoct(fileperms($CONFIG_DATADIRECTORY_ROOT)),-3);
+			if(substr($prems,-1)!='0'){
+				OC_Helper::chmodr($CONFIG_DATADIRECTORY_ROOT,0770);
+				clearstatcache();
+				$prems=substr(decoct(fileperms($CONFIG_DATADIRECTORY_ROOT)),-3);
+				if(substr($prems,2,1)!='0'){
+					$errors[]=array('error'=>'Data directory ('.$CONFIG_DATADIRECTORY_ROOT.') is readable from the web<br/>','hint'=>$permissionsHint);
+				}
+			}
+			if( OC_Config::getValue( "enablebackup", false )){
+				$prems=substr(decoct(fileperms($CONFIG_BACKUPDIRECTORY)),-3);
+				if(substr($prems,-1)!='0'){
+					OC_Helper::chmodr($CONFIG_BACKUPDIRECTORY,0770);
+					clearstatcache();
+					$prems=substr(decoct(fileperms($CONFIG_BACKUPDIRECTORY)),-3);
+					if(substr($prems,2,1)!='0'){
+						$errors[]=array('error'=>'Data directory ('.$CONFIG_BACKUPDIRECTORY.') is readable from the web<br/>','hint'=>$permissionsHint);
+					}
+				}
+			}
+		}else{
+			//TODO: premisions checks for windows hosts
+		}
+		if(is_dir($CONFIG_DATADIRECTORY_ROOT) and !is_writable($CONFIG_DATADIRECTORY_ROOT)){
+			$errors[]=array('error'=>'Data directory ('.$CONFIG_DATADIRECTORY_ROOT.') not writable by ownCloud<br/>','hint'=>$permissionsHint);
+		}
+
+		//TODO: check for php modules
+
+		return $errors;
+	}
+}
diff --git a/log/appinfo/app.php b/log/appinfo/app.php
index 7247104b95d..f3ef650704d 100644
--- a/log/appinfo/app.php
+++ b/log/appinfo/app.php
@@ -1,6 +1,6 @@
 <?php
 
-OC_APP::register( array( "order" => 1, "id" => "log", "name" => "Log" ));
-OC_APP::addSettingsPage( array( "id" => "log", "order" => 999, "href" => OC_HELPER::linkTo( "log", "index.php" ), "name" => "Log", "icon" => OC_HELPER::imagePath( "log", "logs.png" )));
+OC_App::register( array( "order" => 1, "id" => "log", "name" => "Log" ));
+OC_App::addSettingsPage( array( "id" => "log", "order" => 999, "href" => OC_Helper::linkTo( "log", "index.php" ), "name" => "Log", "icon" => OC_Helper::imagePath( "log", "logs.png" )));
 
 ?>
diff --git a/log/index.php b/log/index.php
index 4986526e007..e201411e483 100644
--- a/log/index.php
+++ b/log/index.php
@@ -23,15 +23,14 @@
 
 //require_once('../../config/config.php');
 require_once('../lib/base.php');
-require_once( 'template.php' );
 
-if( !OC_USER::isLoggedIn()){
-	header( 'Location: '.OC_HELPER::linkTo( 'index.php' ));
+if( !OC_User::isLoggedIn()){
+	header( 'Location: '.OC_Helper::linkTo( 'index.php' ));
 	exit();
 }
 
 //load the script
-OC_UTIL::addScript( "log", "log" );
+OC_Util::addScript( "log", "log" );
 
 $allActions=array('login','logout','read','write','create','delete');
 
@@ -43,29 +42,29 @@ if(isset($_POST['save'])){
 			$selectedActions[]=$action;
 		}
 	}
-	OC_PREFERENCES::setValue(OC_USER::getUser(),'log','actions',implode(',',$selectedActions));
-	OC_PREFERENCES::setValue(OC_USER::getUser(),'log','pagesize',$_POST['size']);
+	OC_Preferences::setValue(OC_User::getUser(),'log','actions',implode(',',$selectedActions));
+	OC_Preferences::setValue(OC_User::getUser(),'log','pagesize',$_POST['size']);
 }
 //clear log entries
 elseif(isset($_POST['clear'])){
 	$removeBeforeDate=(isset($_POST['removeBeforeDate']))?$_POST['removeBeforeDate']:0;
 	if($removeBeforeDate!==0){
 		$removeBeforeDate=strtotime($removeBeforeDate);
-		OC_LOG::deleteBefore($removeBeforeDate);
+		OC_Log::deleteBefore($removeBeforeDate);
 	}
 }
 elseif(isset($_POST['clearall'])){
-	OC_LOG::deleteAll();
+	OC_Log::deleteAll();
 }
 
-OC_APP::setActiveNavigationEntry( 'log' );
-$logs=OC_LOG::get();
+OC_App::setActiveNavigationEntry( 'log' );
+$logs=OC_Log::get();
 
 
-$selectedActions=explode(',',OC_PREFERENCES::getValue(OC_USER::getUser(),'log','actions',implode(',',$allActions)));
-$logs=OC_LOG::filterAction($logs,$selectedActions);
+$selectedActions=explode(',',OC_Preferences::getValue(OC_User::getUser(),'log','actions',implode(',',$allActions)));
+$logs=OC_Log::filterAction($logs,$selectedActions);
 
-$pageSize=OC_PREFERENCES::getValue(OC_USER::getUser(),'log','pagesize',20);
+$pageSize=OC_Preferences::getValue(OC_User::getUser(),'log','pagesize',20);
 $pageCount=ceil(count($logs)/$pageSize);
 $page=isset($_GET['page'])?$_GET['page']:0;
 if($page>=$pageCount){
@@ -78,8 +77,8 @@ foreach( $logs as &$i ){
 	$i['date'] =$i['moment'];
 }
 
-$url=OC_HELPER::linkTo( 'log', 'index.php' ).'?page=';
-$pager=OC_UTIL::getPageNavi($pageCount,$page,$url);
+$url=OC_Helper::linkTo( 'log', 'index.php' ).'?page=';
+$pager=OC_Util::getPageNavi($pageCount,$page,$url);
 if($pager){
 	$pagerHTML=$pager->fetchPage();
 }
@@ -97,7 +96,7 @@ foreach($allActions as $action){
 	}
 }
 
-$tmpl = new OC_TEMPLATE( 'log', 'index', 'admin' );
+$tmpl = new OC_Template( 'log', 'index', 'admin' );
 $tmpl->assign( 'logs', $logs );
 $tmpl->assign( 'pager', $pagerHTML );
 $tmpl->assign( 'size', $pageSize );
diff --git a/log/l10n/bg_BG.php b/log/l10n/bg_BG.php
new file mode 100644
index 00000000000..407b447905f
--- /dev/null
+++ b/log/l10n/bg_BG.php
@@ -0,0 +1,14 @@
+<?php $TRANSLATIONS = array(
+"Filter:" => "Филтър:",
+"Logins" => "Влизания:",
+"Logouts" => "Изходи:",
+"Downloads" => "Тегления",
+"Uploads" => "Качвания",
+"Creations" => "Създавания:",
+"Deletions" => "Изтривания:",
+"Show:" => "Показва:",
+"entries per page." => "записа на страница.",
+"What" => "Какво",
+"When" => "Кога",
+"Clear log entries before" => "Изчисти записите от журналите"
+);
diff --git a/log/l10n/fr.php b/log/l10n/fr.php
new file mode 100644
index 00000000000..d411a0e1599
--- /dev/null
+++ b/log/l10n/fr.php
@@ -0,0 +1,14 @@
+<?php $TRANSLATIONS = array(
+"Filter:" => "Filtre :",
+"Logins" => "Connexions",
+"Logouts" => "Déconnexions",
+"Downloads" => "Téléchargements",
+"Uploads" => "Téléversements",
+"Creations" => "Créations",
+"Deletions" => "Suppressions",
+"Show:" => "Afficher :",
+"entries per page." => "entrées par page.",
+"What" => "Quoi",
+"When" => "Quand",
+"Clear log entries before" => "Effacer les entrées du journal au préalable"
+);
diff --git a/search/ajax/search.php b/search/ajax/search.php
new file mode 100644
index 00000000000..c65fbbc63fa
--- /dev/null
+++ b/search/ajax/search.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+* ownCloud
+*
+* @author Robin Appelman
+* @copyright 2010 Robin Appelman icewind1991@gmail.com
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either
+* version 3 of the License, or any later version.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+*
+* You should have received a copy of the GNU Affero General Public
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+
+
+// Init owncloud
+require_once('../../lib/base.php');
+
+// Check if we are a user
+if( !OC_User::isLoggedIn()){
+	header( "Location: ".OC_Helper::linkTo( '', 'index.php' ));
+	exit();
+}
+
+$query=(isset($_GET['query']))?$_GET['query']:'';
+if($query){
+	$result=OC_Search::search($query);
+	echo json_encode($result);
+}else{
+	echo 'false';
+}
+
+?>
\ No newline at end of file
diff --git a/search/appinfo/app.php b/search/appinfo/app.php
index 44834498fec..b91341643f2 100644
--- a/search/appinfo/app.php
+++ b/search/appinfo/app.php
@@ -1,5 +1,5 @@
 <?php
 
-OC_APP::register( array( 'order' => 2, "id" => 'search', 'name' => 'Search' ));
+OC_App::register( array( 'order' => 2, "id" => 'search', 'name' => 'Search' ));
 
 ?>
diff --git a/search/css/results.css b/search/css/results.css
new file mode 100644
index 00000000000..61b7cf541c5
--- /dev/null
+++ b/search/css/results.css
@@ -0,0 +1,8 @@
+#searchresults { position:fixed; top:3.3em; right:0; z-index:50; background-color:white; border:1px solid black; margin-bottom:3em; overflow:auto; max-height:80%; width:40em; }
+#searchresults table{ width:100%; table-layout:fixed; top:1em;border-spacing:0}
+#searchresults td{padding-right:0.3em;padding-left:0.3em;vertical-align:top}
+#searchresults td.result div.text{padding-left:1em;}
+#searchresults div.text,div.name{width:30em; white-space:normal}
+#searchresults td.result{width:30em;}
+#searchresults td.result *{cursor:pointer}
+#searchresults td.type{width:7em;text-align:right; border-right:1px solid #aaa;border-bottom:none}
diff --git a/search/index.php b/search/index.php
index b348b22387f..7369a6d81ce 100644
--- a/search/index.php
+++ b/search/index.php
@@ -24,22 +24,21 @@
 
 // Init owncloud
 require_once('../lib/base.php');
-require( 'template.php' );
 
 // Check if we are a user
-if( !OC_USER::isLoggedIn()){
-	header( "Location: ".OC_HELPER::linkTo( '', 'index.php' ));
+if( !OC_User::isLoggedIn()){
+	header( "Location: ".OC_Helper::linkTo( '', 'index.php' ));
 	exit();
 }
 
 // Load the files we need
-OC_UTIL::addStyle( 'search', 'search' );
+OC_Util::addStyle( 'search', 'search' );
 
 $query=(isset($_POST['query']))?$_POST['query']:'';
 if($query){
-	$results=OC_SEARCH::search($query);
+	$results=OC_Search::search($query);
 }else{
-	header("Location: ".$WEBROOT.'/'.OC_APPCONFIG::getValue("core", "defaultpage", "files/index.php"));
+	header("Location: ".$WEBROOT.'/'.OC_Appconfig::getValue("core", "defaultpage", "files/index.php"));
 	exit();
 }
 
@@ -51,7 +50,7 @@ foreach($results as $result){
 	$resultTypes[$result->type][]=$result;
 }
 
-$tmpl = new OC_TEMPLATE( 'search', 'index', 'user' );
+$tmpl = new OC_Template( 'search', 'index', 'user' );
 $tmpl->assign('resultTypes',$resultTypes);
 $tmpl->printPage();
 
diff --git a/search/js/result.js b/search/js/result.js
new file mode 100644
index 00000000000..b550d4d314d
--- /dev/null
+++ b/search/js/result.js
@@ -0,0 +1,60 @@
+OC.search.catagorizeResults=function(results){
+	var types={};
+	for(var i=0;i<results.length;i++){
+		var type=results[i].type;
+		if(!types[type]){
+			types[type]=[];
+		}
+		types[type].push(results[i]);
+	}
+	return types;
+}
+OC.search.hide=function(){
+	$('#searchresults').hide();
+	if($('#searchbox').val().length>2){
+		$('#searchbox').val('');
+	};
+}
+OC.search.showResults=function(results){
+	if(!OC.search.showResults.loaded){
+		var parent=$('<div/>');
+		$('body').append(parent);
+		parent.load(OC.filePath('search','templates','part.results.php'),function(){
+			OC.search.showResults.loaded=true;
+			$('#searchresults').click(function(event){
+				event.stopPropagation();
+			});
+			$(window).click(function(event){
+				OC.search.hide();
+			});
+			OC.search.showResults(results);
+		});
+	}else{
+		var types=OC.search.catagorizeResults(results);
+		$('#searchresults').show();
+		$('#searchresults tr.result').remove();
+		for(var name in types){
+			var type=types[name];
+			if(type.length>0){
+				var row=$('#searchresults tr.template').clone();
+				row.removeClass('template');
+				row.addClass('result');
+				row.children('td.type').text(name);
+				row.find('td.result a').attr('href',type[0].link);
+				row.find('td.result div.name').text(type[0].name);
+				row.find('td.result div.text').text(type[0].text);
+				$('#searchresults tbody').append(row);
+				for(var i=1;i<type.length;i++){
+					var row=$('#searchresults tr.template').clone();
+					row.removeClass('template');
+					row.addClass('result');
+					row.find('td.result a').attr('href',type[i].link);
+					row.find('td.result div.name').text(type[i].name);
+					row.find('td.result div.text').text(type[i].text);
+					$('#searchresults tbody').append(row);
+				}
+			}
+		}
+	}
+}
+OC.search.showResults.loaded=false;
diff --git a/search/templates/part.results.php b/search/templates/part.results.php
new file mode 100644
index 00000000000..9e39a1c2c8b
--- /dev/null
+++ b/search/templates/part.results.php
@@ -0,0 +1,15 @@
+<div id='searchresults'>
+	<table>
+		<tbody>
+			<tr class='template '>
+				<td class='type'></td>
+				<td class='result'>
+					<a>
+						<div class='name'></div>
+						<div class='text'></div>
+					</a>
+				</td>
+			</tr>
+		</tbody>
+	</table>
+</div>
diff --git a/settings/ajax/changepassword.php b/settings/ajax/changepassword.php
index f568d3ef876..c8c1f740889 100644
--- a/settings/ajax/changepassword.php
+++ b/settings/ajax/changepassword.php
@@ -9,7 +9,7 @@ $l=new OC_L10N('settings');
 header( "Content-Type: application/jsonrequest" );
 
 // Check if we are a user
-if( !OC_USER::isLoggedIn()){
+if( !OC_User::isLoggedIn()){
 	echo json_encode( array( "status" => "error", "data" => array( "message" => $l->t( "Authentication error" ) )));
 	exit();
 }
@@ -21,13 +21,13 @@ if( !isset( $_POST["password"] ) && !isset( $_POST["oldpassword"] )){
 }
 
 // Check if the old password is correct
-if( !OC_USER::checkPassword( $_SESSION["user_id"], $_POST["oldpassword"] )){
+if( !OC_User::checkPassword( $_SESSION["user_id"], $_POST["oldpassword"] )){
 	echo json_encode( array( "status" => "error", "data" => array( "message" => $l->t("Your old password is wrong!") )));
 	exit();
 }
 
 // Change password
-if( OC_USER::setPassword( $_SESSION["user_id"], $_POST["password"] )){
+if( OC_User::setPassword( $_SESSION["user_id"], $_POST["password"] )){
 	echo json_encode( array( "status" => "success", "data" => array( "message" => $l->t("Password changed") )));
 }
 else{
diff --git a/settings/ajax/setlanguage.php b/settings/ajax/setlanguage.php
index bc467fb9004..a5ba3d81ba3 100644
--- a/settings/ajax/setlanguage.php
+++ b/settings/ajax/setlanguage.php
@@ -9,7 +9,7 @@ $l=new OC_L10N('settings');
 header( "Content-Type: application/jsonrequest" );
 
 // Check if we are a user
-if( !OC_USER::isLoggedIn()){
+if( !OC_User::isLoggedIn()){
 	echo json_encode( array( "status" => "error", "data" => array( "message" => $l->t("Authentication error") )));
 	exit();
 }
@@ -17,7 +17,7 @@ if( !OC_USER::isLoggedIn()){
 // Get data
 if( isset( $_POST['lang'] ) ){
 	$lang=$_POST['lang'];
-	OC_PREFERENCES::setValue( OC_USER::getUser(), 'core', 'lang', $lang );
+	OC_Preferences::setValue( OC_User::getUser(), 'core', 'lang', $lang );
 	echo json_encode( array( "status" => "success", "data" => array( "message" => $l->t("Language changed") )));
 }else{
 	echo json_encode( array( "status" => "error", "data" => array( "message" => $l->t("Invalid request") )));
diff --git a/settings/appinfo/app.php b/settings/appinfo/app.php
index f0bf1c71bb4..db4594dcc2d 100644
--- a/settings/appinfo/app.php
+++ b/settings/appinfo/app.php
@@ -1,6 +1,6 @@
 <?php
 
-OC_APP::register( array( "id" => "settings", "name" => "Settings" ));
-OC_APP::addSettingsPage( array( "id" => "settings", "order" => -1000, "href" => OC_HELPER::linkTo( "settings", "index.php" ), "name" => "Personal", "icon" => OC_HELPER::imagePath( "settings", "personal.png" )));
+OC_App::register( array( "id" => "settings", "name" => "Settings" ));
+OC_App::addSettingsPage( array( "id" => "settings", "order" => -1000, "href" => OC_Helper::linkTo( "settings", "index.php" ), "name" => "Personal", "icon" => OC_Helper::imagePath( "settings", "personal.png" )));
 
 ?>
diff --git a/settings/index.php b/settings/index.php
index 07adba142d6..a37ae7e6ea2 100644
--- a/settings/index.php
+++ b/settings/index.php
@@ -1,33 +1,32 @@
 <?php
 
 require_once('../lib/base.php');
-require( 'template.php' );
-if( !OC_USER::isLoggedIn()){
-    header( "Location: ".OC_HELPER::linkTo( "index.php" ));
+if( !OC_User::isLoggedIn()){
+    header( "Location: ".OC_Helper::linkTo( "index.php" ));
     exit();
 }
 
 // Highlight navigation entry
-OC_APP::setActiveNavigationEntry( "settings" );
-OC_UTIL::addScript( "settings", "main" );
-OC_UTIL::addStyle( "settings", "settings" );
+OC_App::setActiveNavigationEntry( "settings" );
+OC_Util::addScript( "settings", "main" );
+OC_Util::addStyle( "settings", "settings" );
 
 // calculate the disc space
-$used=OC_FILESYSTEM::filesize('/');
-$free=OC_FILESYSTEM::free_space();
+$used=OC_Filesystem::filesize('/');
+$free=OC_Filesystem::free_space();
 $total=$free+$used;
 $relative=round(($used/$total)*100);
 
-$lang=OC_PREFERENCES::getValue( OC_USER::getUser(), 'core', 'lang', 'en' );
+$lang=OC_Preferences::getValue( OC_User::getUser(), 'core', 'lang', 'en' );
 $languages=OC_L10N::findAvailableLanguages();
 //put the current language in the front
 unset($languages[array_search($lang,$languages)]);
 array_unshift($languages,$lang);
 
 // Return template
-$tmpl = new OC_TEMPLATE( "settings", "index", "admin");
-$tmpl->assign('usage',OC_HELPER::humanFileSize($used));
-$tmpl->assign('total_space',OC_HELPER::humanFileSize($total));
+$tmpl = new OC_Template( "settings", "index", "admin");
+$tmpl->assign('usage',OC_Helper::humanFileSize($used));
+$tmpl->assign('total_space',OC_Helper::humanFileSize($total));
 $tmpl->assign('usage_relative',$relative);
 $tmpl->assign('languages',$languages);
 $tmpl->printPage();
diff --git a/settings/l10n/bg_BG.php b/settings/l10n/bg_BG.php
new file mode 100644
index 00000000000..f81a9f5e413
--- /dev/null
+++ b/settings/l10n/bg_BG.php
@@ -0,0 +1,19 @@
+<?php $TRANSLATIONS = array(
+"Account information" => "Информация за профила",
+"You're currently using" => "Вие ползвате",
+"of your" => "на Вашето",
+"space" => "място",
+"Change Password" => "Промяна на парола",
+"Your password got changed" => "Вашата парола е сменена",
+"Old password:" => "Стара парола",
+"New password" => "Нова парола",
+"Show new password" => "Покажи новата парола",
+"Language" => "Език",
+"Authentication error" => "Проблем с индентификацията",
+"You have to enter the old and the new password!" => "Трябва да въведете новата и старата парола!",
+"Your old password is wrong!" => "Вашата стара парола е грешна!",
+"Password changed" => "Паролата е сменена",
+"Unable to change password" => "Невъзможна смяна на паролата",
+"Language changed" => "Езика е сменен",
+"Invalid request" => "Невалидна заявка"
+);
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
new file mode 100644
index 00000000000..758189e18bc
--- /dev/null
+++ b/settings/l10n/fr.php
@@ -0,0 +1,19 @@
+<?php $TRANSLATIONS = array(
+"Account information" => "Informations sur le compte",
+"You're currently using" => "Vous utilisez actuellement",
+"of your" => "de votre",
+"space" => "espace de stockage",
+"Change Password" => "Changer votre mot de passe",
+"Your password got changed" => "Votre mot de passe a été changé",
+"Old password:" => "Ancien mot de passe :",
+"New password" => "Nouveau mot de passe :",
+"Show new password" => "Afficher votre nouveau mot de passe",
+"Language" => "Langue",
+"Authentication error" => "Erreur d'authentification",
+"You have to enter the old and the new password!" => "Vous devez saisir l'ancien et le nouveau mot de passe !",
+"Your old password is wrong!" => "Votre ancien mot de passe est erroné !",
+"Password changed" => "Mot de passe changé avec succès",
+"Unable to change password" => "Impossible de changer le mot de passe",
+"Language changed" => "Langue changée avec succès",
+"Invalid request" => "Requète invalide"
+);
diff --git a/tests/index.php b/tests/index.php
index 30ebde11235..efa730f6f8f 100644
--- a/tests/index.php
+++ b/tests/index.php
@@ -26,8 +26,6 @@
  */
  $RUNTIME_NOSETUPFS=true;
 require_once('../lib/base.php');
-require_once('testcase.php');
-require_once('template.php');
 
 $testCases=loadFiles(__DIR__,array('index.php','templates'));
 ob_end_clean();
@@ -48,7 +46,7 @@ foreach($testCases as $testCaseClass){
 	$testResults[$testCaseClass]=$results;
 }
 
-$tmpl = new OC_TEMPLATE( 'tests', 'index');
+$tmpl = new OC_Template( 'tests', 'index');
 $tmpl->assign('tests',$testResults);
 $tmpl->printPage();
 
diff --git a/tests/lib/filesystem.php b/tests/lib/filesystem.php
index 1b1703a06d7..4bfa23884f4 100644
--- a/tests/lib/filesystem.php
+++ b/tests/lib/filesystem.php
@@ -2,46 +2,46 @@
 class OC_FILEYSYSTEM_Test extends OC_TestCase
 {
 	public function setup(){
-		OC_UTIL::setupFS('testuser','testcase');
+		OC_Util::setupFS('testuser','testcase');
 	}
 	public function tearDown(){
-		OC_FILESYSTEM::chroot('');
-		OC_FILESYSTEM::delTree('/testuser');
-		OC_UTIL::tearDownFS();
+		OC_Filesystem::chroot('');
+		OC_Filesystem::delTree('/testuser');
+		OC_Util::tearDownFS();
 	}
 	
 	public function isDir(){
-		$this->assertEquals(true, OC_FILESYSTEM::is_dir('/'),'Root is not a directory');
+		$this->assertEquals(true, OC_Filesystem::is_dir('/'),'Root is not a directory');
 	}
 	
 	public function fileExists(){
-		$this->assertEquals(false, OC_FILESYSTEM::file_exists('/dummy'),'Unexpected result with non-existing file');
-		OC_FILESYSTEM::file_put_contents('/dummy','foo');
-		$this->assertEquals(true, OC_FILESYSTEM::file_exists('/dummy'),'Unexpected result with existing file');
+		$this->assertEquals(false, OC_Filesystem::file_exists('/dummy'),'Unexpected result with non-existing file');
+		OC_Filesystem::file_put_contents('/dummy','foo');
+		$this->assertEquals(true, OC_Filesystem::file_exists('/dummy'),'Unexpected result with existing file');
 	}
 
 	public function mkdir(){
-		OC_FILESYSTEM::mkdir('/dummy');
-		$this->assertEquals(true, OC_FILESYSTEM::file_exists('/dummy'),'No such file or directory after creating folder');
-		$this->assertEquals(true, OC_FILESYSTEM::is_dir('/dummy'),'File created instead of filder');
+		OC_Filesystem::mkdir('/dummy');
+		$this->assertEquals(true, OC_Filesystem::file_exists('/dummy'),'No such file or directory after creating folder');
+		$this->assertEquals(true, OC_Filesystem::is_dir('/dummy'),'File created instead of filder');
 	}
 
 	public function rmdir(){
-		OC_FILESYSTEM::mkdir('/dummy');
-		OC_FILESYSTEM::rmdir('/dummy');
-		$this->assertEquals(false, OC_FILESYSTEM::file_exists('/dummy'),'Folder still exists after removing');
+		OC_Filesystem::mkdir('/dummy');
+		OC_Filesystem::rmdir('/dummy');
+		$this->assertEquals(false, OC_Filesystem::file_exists('/dummy'),'Folder still exists after removing');
 	}
 
 	public function isFile(){
-		$this->assertEquals(false, OC_FILESYSTEM::is_file('/'),'Root is a file');
-		OC_FILESYSTEM::file_put_contents('/dummy','foo');
-		$this->assertEquals(true, OC_FILESYSTEM::is_file('/dummy'),'Created file is not said to be a file');
+		$this->assertEquals(false, OC_Filesystem::is_file('/'),'Root is a file');
+		OC_Filesystem::file_put_contents('/dummy','foo');
+		$this->assertEquals(true, OC_Filesystem::is_file('/dummy'),'Created file is not said to be a file');
 	}
 
 	public function opendir(){
-		OC_FILESYSTEM::file_put_contents('/dummy1','foo');
-		OC_FILESYSTEM::file_put_contents('/dummy2','foo');
-		$dh=OC_FILESYSTEM::opendir('/');
+		OC_Filesystem::file_put_contents('/dummy1','foo');
+		OC_Filesystem::file_put_contents('/dummy2','foo');
+		$dh=OC_Filesystem::opendir('/');
 		if(!$dh){
 			$this->fail('Failed to open root');
 		}
@@ -61,14 +61,14 @@ class OC_FILEYSYSTEM_Test extends OC_TestCase
 	}
 
 	public function filesize(){
-		OC_FILESYSTEM::file_put_contents('/dummy','1234567890');
-		$this->assertEquals(10, OC_FILESYSTEM::filesize('/dummy'),'Unexpected filesize');
+		OC_Filesystem::file_put_contents('/dummy','1234567890');
+		$this->assertEquals(10, OC_Filesystem::filesize('/dummy'),'Unexpected filesize');
 	}
 
 	public function stat(){
-		OC_FILESYSTEM::file_put_contents('/dummy','foo');
+		OC_Filesystem::file_put_contents('/dummy','foo');
 		$time=time();
-		$stat=OC_FILESYSTEM::stat('/dummy');
+		$stat=OC_Filesystem::stat('/dummy');
 		$this->assertEquals(true,abs($time-$stat['atime'])<1,'Unexpected access time');//there can be small difference between those values due to running time
 		$this->assertEquals(true,abs($time-$stat['ctime'])<1,'Unexpected creation time');
 		$this->assertEquals(true,abs($time-$stat['mtime'])<1,'Unexpected modified time');
@@ -76,146 +76,146 @@ class OC_FILEYSYSTEM_Test extends OC_TestCase
 	}
 
 	public function filetype(){
-		OC_FILESYSTEM::file_put_contents('/dummyFile','foo');
-		OC_FILESYSTEM::mkdir('/dummyFolder');
-		$this->assertEquals('file', OC_FILESYSTEM::filetype('/dummyFile'),'Unexpected filetype of file');
-		$this->assertEquals('dir', OC_FILESYSTEM::filetype('/dummyFolder'),'Unexpected filetype of folder');
+		OC_Filesystem::file_put_contents('/dummyFile','foo');
+		OC_Filesystem::mkdir('/dummyFolder');
+		$this->assertEquals('file', OC_Filesystem::filetype('/dummyFile'),'Unexpected filetype of file');
+		$this->assertEquals('dir', OC_Filesystem::filetype('/dummyFolder'),'Unexpected filetype of folder');
 	}
 
 	public function readfile(){
-		OC_FILESYSTEM::file_put_contents('/dummy','foo');
+		OC_Filesystem::file_put_contents('/dummy','foo');
 		ob_start();
-		OC_FILESYSTEM::readfile('/dummy');
+		OC_Filesystem::readfile('/dummy');
 		$this->assertEquals('foo', ob_get_contents(),'Unexpected output of readfile');
 		ob_end_clean();
 	}
 
 	public function isReadable(){
-		OC_FILESYSTEM::file_put_contents('/dummy','foo');
-		$this->assertEquals(true, OC_FILESYSTEM::is_readable('/dummy'),'Can\'t read created file');
+		OC_Filesystem::file_put_contents('/dummy','foo');
+		$this->assertEquals(true, OC_Filesystem::is_readable('/dummy'),'Can\'t read created file');
 	}
 
 	public function isWritable(){
-		OC_FILESYSTEM::file_put_contents('/dummy','foo');
-		$this->assertEquals(true, OC_FILESYSTEM::is_writeable('/dummy'),'Can\'t write created file');
+		OC_Filesystem::file_put_contents('/dummy','foo');
+		$this->assertEquals(true, OC_Filesystem::is_writeable('/dummy'),'Can\'t write created file');
 	}
 
 	public function fileatime(){
-		OC_FILESYSTEM::file_put_contents('/dummy','foo');
+		OC_Filesystem::file_put_contents('/dummy','foo');
 		$time=time();
-		$this->assertEquals(true,abs($time-OC_FILESYSTEM::fileatime('/dummy'))<1,'Unexpected access time');//there can be small difference between those values due to running time
+		$this->assertEquals(true,abs($time-OC_Filesystem::fileatime('/dummy'))<1,'Unexpected access time');//there can be small difference between those values due to running time
 	}
 
 	public function filectime(){
-		OC_FILESYSTEM::file_put_contents('/dummy','foo');
+		OC_Filesystem::file_put_contents('/dummy','foo');
 		$time=time();
-		$this->assertEquals(true,abs($time-OC_FILESYSTEM::filectime('/dummy'))<1,'Unexpected creation time');//there can be small difference between those values due to running time
+		$this->assertEquals(true,abs($time-OC_Filesystem::filectime('/dummy'))<1,'Unexpected creation time');//there can be small difference between those values due to running time
 	}
 
 	public function filemtime(){
-		OC_FILESYSTEM::file_put_contents('/dummy','foo');
+		OC_Filesystem::file_put_contents('/dummy','foo');
 		$time=time();
-		$this->assertEquals(true,abs($time-OC_FILESYSTEM::filemtime('/dummy'))<1,'Unexpected modified time');//there can be small difference between those values due to running time
+		$this->assertEquals(true,abs($time-OC_Filesystem::filemtime('/dummy'))<1,'Unexpected modified time');//there can be small difference between those values due to running time
 	}
 
 	public function fileGetContents(){
-		OC_FILESYSTEM::file_put_contents('/dummy','foo');
-		$this->assertEquals('foo', OC_FILESYSTEM::file_get_contents('/dummy'),'Unexpected content of file');
+		OC_Filesystem::file_put_contents('/dummy','foo');
+		$this->assertEquals('foo', OC_Filesystem::file_get_contents('/dummy'),'Unexpected content of file');
 	}
 
 	public function unlink(){
-		OC_FILESYSTEM::file_put_contents('/dummy','foo');
-		OC_FILESYSTEM::unlink('/dummy');
-		$this->assertEquals(false, OC_FILESYSTEM::file_exists('/dummy'),'File still exists after deletion');
+		OC_Filesystem::file_put_contents('/dummy','foo');
+		OC_Filesystem::unlink('/dummy');
+		$this->assertEquals(false, OC_Filesystem::file_exists('/dummy'),'File still exists after deletion');
 	}
 
 	public function rename(){
-		OC_FILESYSTEM::file_put_contents('/dummy','foo');
-		OC_FILESYSTEM::rename('/dummy','/bar');
-		$this->assertEquals(true, OC_FILESYSTEM::file_exists('/bar'),'New file doesnt exists after moving');
-		$this->assertEquals(false, OC_FILESYSTEM::file_exists('/dummy'),'Old file still exists after moving');
-		$this->assertEquals('foo', OC_FILESYSTEM::file_get_contents('/bar'),'Unexpected content of file after moving');
+		OC_Filesystem::file_put_contents('/dummy','foo');
+		OC_Filesystem::rename('/dummy','/bar');
+		$this->assertEquals(true, OC_Filesystem::file_exists('/bar'),'New file doesnt exists after moving');
+		$this->assertEquals(false, OC_Filesystem::file_exists('/dummy'),'Old file still exists after moving');
+		$this->assertEquals('foo', OC_Filesystem::file_get_contents('/bar'),'Unexpected content of file after moving');
 	}
 
 	public function copy(){
-		OC_FILESYSTEM::file_put_contents('/dummy','foo');
-		OC_FILESYSTEM::copy('/dummy','/bar');
-		$this->assertEquals(true, OC_FILESYSTEM::file_exists('/bar'),'New file doesnt exists after copying');
-		$this->assertEquals(true, OC_FILESYSTEM::file_exists('/dummy'),'Old file doesnt exists after copying');
-		$this->assertEquals('foo', OC_FILESYSTEM::file_get_contents('/bar'),'Unexpected content of file after copying');
+		OC_Filesystem::file_put_contents('/dummy','foo');
+		OC_Filesystem::copy('/dummy','/bar');
+		$this->assertEquals(true, OC_Filesystem::file_exists('/bar'),'New file doesnt exists after copying');
+		$this->assertEquals(true, OC_Filesystem::file_exists('/dummy'),'Old file doesnt exists after copying');
+		$this->assertEquals('foo', OC_Filesystem::file_get_contents('/bar'),'Unexpected content of file after copying');
 	}
 
 	public function fopen(){
-		OC_FILESYSTEM::file_put_contents('/dummy','foo');
-		$fh=OC_FILESYSTEM::fopen('/dummy','r');
+		OC_Filesystem::file_put_contents('/dummy','foo');
+		$fh=OC_Filesystem::fopen('/dummy','r');
 		if(!$fh){
 			$this->fail('Cant open file for reading');
 		}
 		$content=fread($fh,3);
 		$this->assertEquals('foo', $content,'Unexpected content of file');
 		fclose($fh);
-		$fh=OC_FILESYSTEM::fopen('/dummy','a');
+		$fh=OC_Filesystem::fopen('/dummy','a');
 		fwrite($fh,'bar',3);
 		fclose($fh);
-		$this->assertEquals('foobar', OC_FILESYSTEM::file_get_contents('/dummy'),'Unexpected content of file after appending');
-		$fh=OC_FILESYSTEM::fopen('/dummy','w');
+		$this->assertEquals('foobar', OC_Filesystem::file_get_contents('/dummy'),'Unexpected content of file after appending');
+		$fh=OC_Filesystem::fopen('/dummy','w');
 		fwrite($fh,'bar',3);
 		fclose($fh);
-		$this->assertEquals('bar', OC_FILESYSTEM::file_get_contents('/dummy'),'Unexpected content of file after writing');
+		$this->assertEquals('bar', OC_Filesystem::file_get_contents('/dummy'),'Unexpected content of file after writing');
 	}
 
 	public function toTmpFile(){
-		OC_FILESYSTEM::file_put_contents('/dummy','foo');
-		$tmp=OC_FILESYSTEM::toTmpFile('/dummy');
+		OC_Filesystem::file_put_contents('/dummy','foo');
+		$tmp=OC_Filesystem::toTmpFile('/dummy');
 		$this->assertEquals('foo', file_get_contents($tmp),'Unexpected content of temporary file');
 		unlink($tmp);
 	}
 
 	public function fromTmpFile(){
-		OC_FILESYSTEM::file_put_contents('/dummy','foo');
-		$tmp=OC_FILESYSTEM::toTmpFile('/dummy');
-		OC_FILESYSTEM::fromTmpFile($tmp,'/bar');
-		$this->assertEquals('foo', OC_FILESYSTEM::file_get_contents('/bar'),'Unexpected content of new file');
+		OC_Filesystem::file_put_contents('/dummy','foo');
+		$tmp=OC_Filesystem::toTmpFile('/dummy');
+		OC_Filesystem::fromTmpFile($tmp,'/bar');
+		$this->assertEquals('foo', OC_Filesystem::file_get_contents('/bar'),'Unexpected content of new file');
 		$this->assertEquals(false, file_exists($tmp),'Temporary file still exists');
 	}
 
 	public function getMimeType(){
-		OC_FILESYSTEM::file_put_contents('/dummy','some plain text');
-		$this->assertEquals('text/plain', OC_FILESYSTEM::getMimeType('/dummy'),'Unexpected mimetype of pain text file');
-		OC_FILESYSTEM::file_put_contents('/dummy',"<?xml version='1.0'?>\n</dummy>");
-		$this->assertEquals('application/xml', OC_FILESYSTEM::getMimeType('/dummy'),'Unexpected mimetype of xml file');
+		OC_Filesystem::file_put_contents('/dummy','some plain text');
+		$this->assertEquals('text/plain', OC_Filesystem::getMimeType('/dummy'),'Unexpected mimetype of pain text file');
+		OC_Filesystem::file_put_contents('/dummy',"<?xml version='1.0'?>\n</dummy>");
+		$this->assertEquals('application/xml', OC_Filesystem::getMimeType('/dummy'),'Unexpected mimetype of xml file');
 	}
 
 	public function delTree(){
-		OC_FILESYSTEM::mkdir('/dummy');
-		OC_FILESYSTEM::file_put_contents('/dummy/bar','foo');
-		OC_FILESYSTEM::delTree('/dummy');
-		$this->assertEquals(false, OC_FILESYSTEM::file_exists('/dummy/bar'),'File in deleted folder still exists');
-		$this->assertEquals(false, OC_FILESYSTEM::file_exists('/dummy'),'Deleted folder still exists');
+		OC_Filesystem::mkdir('/dummy');
+		OC_Filesystem::file_put_contents('/dummy/bar','foo');
+		OC_Filesystem::delTree('/dummy');
+		$this->assertEquals(false, OC_Filesystem::file_exists('/dummy/bar'),'File in deleted folder still exists');
+		$this->assertEquals(false, OC_Filesystem::file_exists('/dummy'),'Deleted folder still exists');
 	}
 
 	public function getTree(){
-		OC_FILESYSTEM::mkdir('/dummy');
-		OC_FILESYSTEM::file_put_contents('/dummy/bar','foo');
+		OC_Filesystem::mkdir('/dummy');
+		OC_Filesystem::file_put_contents('/dummy/bar','foo');
 		$expected=array('/dummy','/dummy/bar');
-		$this->assertEquals($expected, OC_FILESYSTEM::getTree('/dummy'),'Unexpected filelist returned');
+		$this->assertEquals($expected, OC_Filesystem::getTree('/dummy'),'Unexpected filelist returned');
 	}
 
 	public function hash(){
-		OC_FILESYSTEM::file_put_contents('/dummy','foo');
-		$this->assertEquals(md5('foo'), OC_FILESYSTEM::hash('md5','/dummy'),'Unexpected md5 hash of file');
+		OC_Filesystem::file_put_contents('/dummy','foo');
+		$this->assertEquals(md5('foo'), OC_Filesystem::hash('md5','/dummy'),'Unexpected md5 hash of file');
 	}
 
 	public function freeSpace(){
-		$oldSpace=OC_FILESYSTEM::free_space('/');
-		OC_FILESYSTEM::file_put_contents('/dummy','foo');
-		$newSpace=OC_FILESYSTEM::free_space('/');
+		$oldSpace=OC_Filesystem::free_space('/');
+		OC_Filesystem::file_put_contents('/dummy','foo');
+		$newSpace=OC_Filesystem::free_space('/');
 		$this->assertEquals(true, $newSpace<$oldSpace,'free space not smaller after creating a non empty file');
 	}
 
 	public function search(){
-		OC_FILESYSTEM::file_put_contents('/dummy','foo');
-		$this->assertEquals(array('/dummy'),OC_FILESYSTEM::search('my'),'unexpected file list after search');
+		OC_Filesystem::file_put_contents('/dummy','foo');
+		$this->assertEquals(array('/dummy'),OC_Filesystem::search('my'),'unexpected file list after search');
 	}
 }
 return 'OC_FILEYSYSTEM_Test';