diff --git a/app/Parvula/Repositories/Flatfiles/BaseRepositoryFlatfiles.php b/app/Repositories/Flatfiles/BaseRepositoryFlatfiles.php
similarity index 93%
rename from app/Parvula/Repositories/Flatfiles/BaseRepositoryFlatfiles.php
rename to app/Repositories/Flatfiles/BaseRepositoryFlatfiles.php
index 9affac1..ed322f8 100644
--- a/app/Parvula/Repositories/Flatfiles/BaseRepositoryFlatfiles.php
+++ b/app/Repositories/Flatfiles/BaseRepositoryFlatfiles.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Parvula\Repositories\Flatfiles;
+namespace App\Repositories\Flatfiles;
 
 use Parvula\Repositories\BaseRepository;
 
-abstract class BaseRepositoryFlatfiles extends BaseRepository {
-
+abstract class BaseRepositoryFlatfiles extends BaseRepository
+{
 	/**
 	 * Collection
 	 * @var Parvula\Collections\Collection Collection of model
diff --git a/app/Parvula/Repositories/Flatfiles/ConfigRepositoryFlatfiles.php b/app/Repositories/Flatfiles/ConfigRepositoryFlatfiles.php
similarity index 94%
rename from app/Parvula/Repositories/Flatfiles/ConfigRepositoryFlatfiles.php
rename to app/Repositories/Flatfiles/ConfigRepositoryFlatfiles.php
index c56ffc8..f150d34 100644
--- a/app/Parvula/Repositories/Flatfiles/ConfigRepositoryFlatfiles.php
+++ b/app/Repositories/Flatfiles/ConfigRepositoryFlatfiles.php
@@ -1,12 +1,10 @@
 <?php
 
-namespace Parvula\Repositories\Flatfiles;
+namespace App\Repositories\Flatfiles;
 
-use Parvula\ArrayTrait;
 use Parvula\FileParser;
 use Parvula\FilesSystem as Files;
 use Parvula\Models\Config;
-use Parvula\Collections\Collection;
 
 class ConfigRepositoryFlatfiles extends BaseRepositoryFlatfiles
 {
diff --git a/app/Parvula/Repositories/Flatfiles/PageRepositoryFlatfiles.php b/app/Repositories/Flatfiles/PageRepositoryFlatfiles.php
similarity index 99%
rename from app/Parvula/Repositories/Flatfiles/PageRepositoryFlatfiles.php
rename to app/Repositories/Flatfiles/PageRepositoryFlatfiles.php
index a4c0b9d..42c3c3d 100644
--- a/app/Parvula/Repositories/Flatfiles/PageRepositoryFlatfiles.php
+++ b/app/Repositories/Flatfiles/PageRepositoryFlatfiles.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Parvula\Repositories\Flatfiles;
+namespace App\Repositories\Flatfiles;
 
 use SplFileInfo;
 use Parvula\Models\Page;
diff --git a/app/Parvula/Repositories/Flatfiles/UserRepositoryFlatfiles.php b/app/Repositories/Flatfiles/UserRepositoryFlatfiles.php
similarity index 94%
rename from app/Parvula/Repositories/Flatfiles/UserRepositoryFlatfiles.php
rename to app/Repositories/Flatfiles/UserRepositoryFlatfiles.php
index 4ba746b..f216636 100644
--- a/app/Parvula/Repositories/Flatfiles/UserRepositoryFlatfiles.php
+++ b/app/Repositories/Flatfiles/UserRepositoryFlatfiles.php
@@ -1,8 +1,7 @@
 <?php
 
-namespace Parvula\Repositories\Flatfiles;
+namespace App\Repositories\Flatfiles;
 
-use Parvula\ArrayTrait;
 use Parvula\FileParser;
 use Parvula\Models\User;
 use Parvula\Collections\Collection;
diff --git a/app/Parvula/Repositories/Mongo/BaseRepositoryMongo.php b/app/Repositories/Mongo/BaseRepositoryMongo.php
similarity index 98%
rename from app/Parvula/Repositories/Mongo/BaseRepositoryMongo.php
rename to app/Repositories/Mongo/BaseRepositoryMongo.php
index 90ccff4..4b7ec3f 100644
--- a/app/Parvula/Repositories/Mongo/BaseRepositoryMongo.php
+++ b/app/Repositories/Mongo/BaseRepositoryMongo.php
@@ -1,5 +1,6 @@
 <?php
-namespace Parvula\Repositories\Mongo;
+
+namespace App\Repositories\Mongo;
 
 use Exception;
 use Parvula\Collections\MongoCollection;
diff --git a/app/Parvula/Repositories/Mongo/ConfigRepositoryMongo.php b/app/Repositories/Mongo/ConfigRepositoryMongo.php
similarity index 96%
rename from app/Parvula/Repositories/Mongo/ConfigRepositoryMongo.php
rename to app/Repositories/Mongo/ConfigRepositoryMongo.php
index cb1e6d3..b0e0e11 100644
--- a/app/Parvula/Repositories/Mongo/ConfigRepositoryMongo.php
+++ b/app/Repositories/Mongo/ConfigRepositoryMongo.php
@@ -1,9 +1,8 @@
 <?php
 
-namespace Parvula\Repositories\Mongo;
+namespace App\Repositories\Mongo;
 
 use Exception;
-use Parvula\ArrayTrait;
 use Parvula\FileParser;
 use Parvula\FilesSystem as Files;
 use Parvula\Models\Config;
diff --git a/app/Parvula/Repositories/Mongo/PageRepositoryMongo.php b/app/Repositories/Mongo/PageRepositoryMongo.php
similarity index 98%
rename from app/Parvula/Repositories/Mongo/PageRepositoryMongo.php
rename to app/Repositories/Mongo/PageRepositoryMongo.php
index c7a50e1..b9228b3 100644
--- a/app/Parvula/Repositories/Mongo/PageRepositoryMongo.php
+++ b/app/Repositories/Mongo/PageRepositoryMongo.php
@@ -1,9 +1,8 @@
 <?php
 
-namespace Parvula\Repositories\Mongo;
+namespace App\Repositories\Mongo;
 
 use MongoDB\Collection as MongoCollectionBase;
-use Parvula\BaseRepository;
 use Parvula\Models\Page;
 use Parvula\Exceptions\IOException;
 use Parvula\Exceptions\PageException;
diff --git a/app/Parvula/Repositories/Mongo/UserRepositoryMongo.php b/app/Repositories/Mongo/UserRepositoryMongo.php
similarity index 95%
rename from app/Parvula/Repositories/Mongo/UserRepositoryMongo.php
rename to app/Repositories/Mongo/UserRepositoryMongo.php
index b63a2f0..e405896 100644
--- a/app/Parvula/Repositories/Mongo/UserRepositoryMongo.php
+++ b/app/Repositories/Mongo/UserRepositoryMongo.php
@@ -1,9 +1,7 @@
 <?php
 
-namespace Parvula\Repositories\Mongo;
+namespace App\Repositories\Mongo;
 
-use Parvula\ArrayTrait;
-use Parvula\FileParser;
 use Parvula\Models\User;
 use MongoDB\Collection as MongoCollectionBase;
 
diff --git a/app/bootstrap.php b/app/bootstrap.php
index 43c55ca..3e846cf 100755
--- a/app/bootstrap.php
+++ b/app/bootstrap.php
@@ -1,6 +1,7 @@
 <?php
 
-namespace Parvula;
+use Parvula\Parvula;
+use function Parvula\classAliases;
 
 require 'constants.php';
 
@@ -22,9 +23,6 @@
 // Register services and helpers
 require _APP_ . 'services.php';
 
-// Load helpers
-require _APP_ . 'helpers.php';
-
 $config = $app['config'];
 $config->set('__time__', $time);
 
diff --git a/app/routes/api/auth.php b/app/routes/api/auth.php
index d10d3a6..dea12ef 100644
--- a/app/routes/api/auth.php
+++ b/app/routes/api/auth.php
@@ -1,11 +1,6 @@
 <?php
 
-namespace Parvula;
-
-use DateTime;
-use Exception;
 use Firebase\JWT\JWT;
-use Parvula\Exceptions\IOException;
 
 /**
  * @api {get} /auth Login
@@ -72,7 +67,7 @@
 			'exp' => $future->getTimeStamp(), // expiration time
 			'jti' => JWT::urlsafeB64Encode(random_bytes(32)), // unique identifier
 			'sub' => $username, // subject
-			'scope' => $user->getRoles()
+			'scope' => $user->getRoles(),
 		];
 	} catch (Exception $e) {
 		die('Could not generate a random string. Is our OS secure?');
diff --git a/app/routes/api/config.php b/app/routes/api/config.php
index b560f7e..182cbc3 100644
--- a/app/routes/api/config.php
+++ b/app/routes/api/config.php
@@ -1,11 +1,10 @@
 <?php
 
-namespace Parvula;
-
 use Rs\Json\Patch;
 use Rs\Json\Patch\InvalidPatchDocumentJsonException;
 use Rs\Json\Patch\InvalidTargetDocumentJsonException;
 use Rs\Json\Patch\InvalidOperationException;
+use function Parvula\app;
 
 // @ALPHA
 
diff --git a/app/routes/api/files.php b/app/routes/api/files.php
index 8c6a23d..a0a0205 100644
--- a/app/routes/api/files.php
+++ b/app/routes/api/files.php
@@ -1,12 +1,8 @@
 <?php
 
-namespace Parvula;
-
-use Exception;
-use SplFileInfo;
-use RuntimeException;
 use Parvula\FilesSystem;
 use Parvula\Exceptions\IOException;
+use function Parvula\url;
 
 // @ALPHA.2
 
diff --git a/app/routes/api/index.php b/app/routes/api/index.php
index 7481213..cdebae0 100644
--- a/app/routes/api/index.php
+++ b/app/routes/api/index.php
@@ -1,8 +1,6 @@
 <?php
 
-namespace Parvula;
-
-use Exception;
+use function Parvula\app;
 
 function checkTokenScope(array $scope, $token) {
 	$scopeToken = isset($token->scope) ? $token->scope : [];
diff --git a/app/routes/api/pages.php b/app/routes/api/pages.php
index c1bb595..f99c9aa 100644
--- a/app/routes/api/pages.php
+++ b/app/routes/api/pages.php
@@ -1,15 +1,10 @@
 <?php
 
-namespace Parvula;
-
-use Exception;
-use Parvula\Models\Page;
-use Parvula\Models\PagesFlatFiles;
-use Parvula\Exceptions\IOException;
 use Rs\Json\Patch;
 use Rs\Json\Patch\InvalidOperationException;
 use Rs\Json\Patch\InvalidPatchDocumentJsonException;
 use Rs\Json\Patch\InvalidTargetDocumentJsonException;
+use function Parvula\app;
 
 /**
  * @api {post} /pages Create a new page
diff --git a/app/routes/api/pages.public.php b/app/routes/api/pages.public.php
index 9b62ecf..1626e7d 100644
--- a/app/routes/api/pages.public.php
+++ b/app/routes/api/pages.public.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Parvula;
-
+use Parvula\Models\Page;
 use Parvula\Transformers\PageHeadTransformer;
+use function Parvula\app;
 
 /**
  * @api {get} /pages Get all pages
@@ -80,14 +80,14 @@
 		], 404);
 	}
 
-	return $this->api->json($res, $result->transform(function (Models\Page $page) {
+	return $this->api->json($res, $result->transform(function (Page $page) {
 		$pageArr = $page->toArray();
 
 		if ($page->hasParent()) {
 			$pageArr += [
 				'parent' => [
 					'href' => '/pages/' . $page->parent->slug
-				]
+				],
 			];
 		}
 
diff --git a/app/routes/api/themes.php b/app/routes/api/themes.php
index ef75a3d..d950ead 100644
--- a/app/routes/api/themes.php
+++ b/app/routes/api/themes.php
@@ -1,9 +1,6 @@
 <?php
 
-namespace Parvula;
-
-use Exception;
-use Parvula\Exceptions\IOException;
+use function Parvula\app;
 
 /**
  * @api {get} /themes List of themes
diff --git a/app/routes/api/users.php b/app/routes/api/users.php
index 5601e81..1cde4a5 100644
--- a/app/routes/api/users.php
+++ b/app/routes/api/users.php
@@ -1,10 +1,7 @@
 <?php
 
-namespace Parvula;
-
-use Exception;
-use Parvula\Exceptions\IOException;
 use Parvula\Models\User;
+use function Parvula\app;
 
 /**
  * @api {get} /users List of users usernames
diff --git a/app/routes/web.php b/app/routes/web.php
index 9e4c018..89480fc 100644
--- a/app/routes/web.php
+++ b/app/routes/web.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace Parvula;
-
 // Pages handler (slug must be `a-z0-9-_+/` (will be rewritten to lowercase if needed))
+use function Parvula\app;
+use function Parvula\url;
+
 $router->map(['GET', 'POST'], '/{slug:[a-zA-Z0-9\-_\+\/]*}', function ($req, $res, $args) use ($app) {
 	$view = $app['view'];
 	$pages = $app['pages'];
diff --git a/app/services.php b/app/services.php
index c350fc3..2b9ab02 100644
--- a/app/services.php
+++ b/app/services.php
@@ -3,16 +3,27 @@
 // Register services
 // ----------------------------- //
 
-namespace Parvula;
+namespace App;
 
 use DateTime;
 use Exception;
 use RuntimeException;
-use Pimple\Container;
+use Parvula\Models\Page;
 use Parvula\Models\Config;
+use Parvula\FileParser;
+use Parvula\Http\APIResponse;
+use Parvula\PluginMediator;
+use Parvula\Session;
+use Pimple\Container;
+use Parvula\Parsers;
+use Parvula\Services;
+use Parvula\ContentParser;
 use Parvula\FilesSystem as Files;
 use Monolog\Logger;
 use Monolog\Handler\StreamHandler;
+use function Parvula\listPagesRoot;
+use function Parvula\getPluginList;
+use function Parvula\listPagesAndChildren;
 
 $app['config'] = function (Container $c) {
 	$base = _CONFIG_ . 'system.';
@@ -89,7 +100,7 @@
 			'routerCacheFile' => $cacheFile,
 			'displayErrorDetails' => $c['config']->get('debug', false)
 		],
-		'api' => new Http\APIResponse(),
+		'api' => new APIResponse(),
 		'logger' => $c['loggerHandler']
 	];
 
@@ -208,7 +219,7 @@ function ($arr) {
 };
 
 $app['auth'] = function (Container $c) {
-	return new Service\AuthenticationService($c['session'], hash('sha1', '@TODO'));
+	return new Services\AuthenticationService($c['session'], hash('sha1', '@TODO'));
 	// Service\AuthenticationService($c['session'], hash('sha1', $c['request']->ip . $c['request']->userAgent));
 };
 
@@ -373,7 +384,7 @@ function ($arr) {
 	});
 
 	// System date format
-	$view->registerFunction('pageDateFormat', function (Models\Page $page) use ($config) {
+	$view->registerFunction('pageDateFormat', function (Page $page) use ($config) {
 		return $page->getDateTime()->format($config->get('dateFormat'));
 	});
 
diff --git a/composer.json b/composer.json
index 40151c1..bac5d0f 100644
--- a/composer.json
+++ b/composer.json
@@ -42,9 +42,13 @@
     },
     "autoload": {
         "psr-4": {
-            "Parvula\\": "app/Parvula",
+            "App\\": "app",
+            "Parvula\\": "core",
             "Plugins\\": "public/plugins"
-        }
+        },
+        "files": [
+            "core/helpers.php"
+        ]
     },
     "config": {
         "preferred-install": "dist"
diff --git a/app/Parvula/AccessorTrait.php b/core/AccessorTrait.php
similarity index 100%
rename from app/Parvula/AccessorTrait.php
rename to core/AccessorTrait.php
diff --git a/app/Parvula/ArrayableInterface.php b/core/ArrayableInterface.php
similarity index 100%
rename from app/Parvula/ArrayableInterface.php
rename to core/ArrayableInterface.php
diff --git a/app/Parvula/Asset.php b/core/Asset.php
similarity index 100%
rename from app/Parvula/Asset.php
rename to core/Asset.php
diff --git a/app/Parvula/Cache.php b/core/Cache.php
similarity index 100%
rename from app/Parvula/Cache.php
rename to core/Cache.php
diff --git a/app/Parvula/Collections/Collection.php b/core/Collections/Collection.php
similarity index 100%
rename from app/Parvula/Collections/Collection.php
rename to core/Collections/Collection.php
diff --git a/app/Parvula/Collections/MongoCollection.php b/core/Collections/MongoCollection.php
similarity index 100%
rename from app/Parvula/Collections/MongoCollection.php
rename to core/Collections/MongoCollection.php
diff --git a/app/Parvula/Collections/Traits/PageCollectionTrait.php b/core/Collections/Traits/PageCollectionTrait.php
similarity index 100%
rename from app/Parvula/Collections/Traits/PageCollectionTrait.php
rename to core/Collections/Traits/PageCollectionTrait.php
diff --git a/app/Parvula/Console/DevTasks.php b/core/Console/DevTasks.php
similarity index 100%
rename from app/Parvula/Console/DevTasks.php
rename to core/Console/DevTasks.php
diff --git a/app/Parvula/Console/Doctor.php b/core/Console/Doctor.php
similarity index 100%
rename from app/Parvula/Console/Doctor.php
rename to core/Console/Doctor.php
diff --git a/app/Parvula/ContentParser/ContentParserInterface.php b/core/ContentParser/ContentParserInterface.php
similarity index 100%
rename from app/Parvula/ContentParser/ContentParserInterface.php
rename to core/ContentParser/ContentParserInterface.php
diff --git a/app/Parvula/ContentParser/Markdown.php b/core/ContentParser/Markdown.php
similarity index 100%
rename from app/Parvula/ContentParser/Markdown.php
rename to core/ContentParser/Markdown.php
diff --git a/app/Parvula/ContentParser/None.php b/core/ContentParser/None.php
similarity index 100%
rename from app/Parvula/ContentParser/None.php
rename to core/ContentParser/None.php
diff --git a/app/Parvula/ContentParser/ParvulaParsedownExtra.php b/core/ContentParser/ParvulaParsedownExtra.php
similarity index 96%
rename from app/Parvula/ContentParser/ParvulaParsedownExtra.php
rename to core/ContentParser/ParvulaParsedownExtra.php
index 4761120..a2d9092 100644
--- a/app/Parvula/ContentParser/ParvulaParsedownExtra.php
+++ b/core/ContentParser/ParvulaParsedownExtra.php
@@ -3,6 +3,7 @@
 namespace Parvula\ContentParser;
 
 use ParsedownExtra;
+use function Parvula\url;
 
 /**
  * Extends ParsedownExtra to add link functionalities.
diff --git a/app/Parvula/Exceptions/BadObjectCallException.php b/core/Exceptions/BadObjectCallException.php
similarity index 100%
rename from app/Parvula/Exceptions/BadObjectCallException.php
rename to core/Exceptions/BadObjectCallException.php
diff --git a/app/Parvula/Exceptions/IOException.php b/core/Exceptions/IOException.php
similarity index 100%
rename from app/Parvula/Exceptions/IOException.php
rename to core/Exceptions/IOException.php
diff --git a/app/Parvula/Exceptions/NotFoundException.php b/core/Exceptions/NotFoundException.php
similarity index 100%
rename from app/Parvula/Exceptions/NotFoundException.php
rename to core/Exceptions/NotFoundException.php
diff --git a/app/Parvula/Exceptions/PageException.php b/core/Exceptions/PageException.php
similarity index 100%
rename from app/Parvula/Exceptions/PageException.php
rename to core/Exceptions/PageException.php
diff --git a/app/Parvula/Exceptions/ParseException.php b/core/Exceptions/ParseException.php
similarity index 100%
rename from app/Parvula/Exceptions/ParseException.php
rename to core/Exceptions/ParseException.php
diff --git a/app/Parvula/Exceptions/SectionException.php b/core/Exceptions/SectionException.php
similarity index 100%
rename from app/Parvula/Exceptions/SectionException.php
rename to core/Exceptions/SectionException.php
diff --git a/app/Parvula/FileParser.php b/core/FileParser.php
similarity index 100%
rename from app/Parvula/FileParser.php
rename to core/FileParser.php
diff --git a/app/Parvula/FilesSystem.php b/core/FilesSystem.php
similarity index 100%
rename from app/Parvula/FilesSystem.php
rename to core/FilesSystem.php
diff --git a/app/Parvula/Html.php b/core/Html.php
similarity index 100%
rename from app/Parvula/Html.php
rename to core/Html.php
diff --git a/app/Parvula/Http/APIResponse.php b/core/Http/APIResponse.php
similarity index 100%
rename from app/Parvula/Http/APIResponse.php
rename to core/Http/APIResponse.php
diff --git a/app/Parvula/IOInterface.php b/core/IOInterface.php
similarity index 100%
rename from app/Parvula/IOInterface.php
rename to core/IOInterface.php
diff --git a/app/Parvula/IterableTrait.php b/core/IterableTrait.php
similarity index 100%
rename from app/Parvula/IterableTrait.php
rename to core/IterableTrait.php
diff --git a/app/Parvula/Models/Config.php b/core/Models/Config.php
similarity index 100%
rename from app/Parvula/Models/Config.php
rename to core/Models/Config.php
diff --git a/app/Parvula/Models/Model.php b/core/Models/Model.php
similarity index 100%
rename from app/Parvula/Models/Model.php
rename to core/Models/Model.php
diff --git a/app/Parvula/Models/Page.php b/core/Models/Page.php
similarity index 100%
rename from app/Parvula/Models/Page.php
rename to core/Models/Page.php
diff --git a/app/Parvula/Models/Section.php b/core/Models/Section.php
similarity index 100%
rename from app/Parvula/Models/Section.php
rename to core/Models/Section.php
diff --git a/app/Parvula/Models/Theme.php b/core/Models/Theme.php
similarity index 100%
rename from app/Parvula/Models/Theme.php
rename to core/Models/Theme.php
diff --git a/app/Parvula/Models/User.php b/core/Models/User.php
similarity index 100%
rename from app/Parvula/Models/User.php
rename to core/Models/User.php
diff --git a/app/Parvula/PageRenderers/DatabasePageRenderer.php b/core/PageRenderers/DatabasePageRenderer.php
similarity index 100%
rename from app/Parvula/PageRenderers/DatabasePageRenderer.php
rename to core/PageRenderers/DatabasePageRenderer.php
diff --git a/app/Parvula/PageRenderers/FlatFilesPageRenderer.php b/core/PageRenderers/FlatFilesPageRenderer.php
similarity index 100%
rename from app/Parvula/PageRenderers/FlatFilesPageRenderer.php
rename to core/PageRenderers/FlatFilesPageRenderer.php
diff --git a/app/Parvula/PageRenderers/PageRendererInterface.php b/core/PageRenderers/PageRendererInterface.php
similarity index 100%
rename from app/Parvula/PageRenderers/PageRendererInterface.php
rename to core/PageRenderers/PageRendererInterface.php
diff --git a/app/Parvula/Parsers/Json.php b/core/Parsers/Json.php
similarity index 100%
rename from app/Parvula/Parsers/Json.php
rename to core/Parsers/Json.php
diff --git a/app/Parvula/Parsers/ParserInterface.php b/core/Parsers/ParserInterface.php
similarity index 100%
rename from app/Parvula/Parsers/ParserInterface.php
rename to core/Parsers/ParserInterface.php
diff --git a/app/Parvula/Parsers/Php.php b/core/Parsers/Php.php
similarity index 100%
rename from app/Parvula/Parsers/Php.php
rename to core/Parsers/Php.php
diff --git a/app/Parvula/Parsers/Yaml.php b/core/Parsers/Yaml.php
similarity index 100%
rename from app/Parvula/Parsers/Yaml.php
rename to core/Parsers/Yaml.php
diff --git a/app/Parvula/Parvula.php b/core/Parvula.php
similarity index 100%
rename from app/Parvula/Parvula.php
rename to core/Parvula.php
diff --git a/app/Parvula/Plugin.php b/core/Plugin.php
similarity index 100%
rename from app/Parvula/Plugin.php
rename to core/Plugin.php
diff --git a/app/Parvula/PluginMediator.php b/core/PluginMediator.php
similarity index 100%
rename from app/Parvula/PluginMediator.php
rename to core/PluginMediator.php
diff --git a/app/Parvula/Repositories/BaseRepository.php b/core/Repositories/BaseRepository.php
similarity index 97%
rename from app/Parvula/Repositories/BaseRepository.php
rename to core/Repositories/BaseRepository.php
index 6209dc9..a42dc62 100644
--- a/app/Parvula/Repositories/BaseRepository.php
+++ b/core/Repositories/BaseRepository.php
@@ -2,8 +2,8 @@
 
 namespace Parvula\Repositories;
 
-abstract class BaseRepository {
-
+abstract class BaseRepository
+{
 	/**
 	 * The repository current's class name model
 	 *
diff --git a/app/Parvula/Repositories/PageRepositoryTrait.php b/core/Repositories/PageRepositoryTrait.php
similarity index 95%
rename from app/Parvula/Repositories/PageRepositoryTrait.php
rename to core/Repositories/PageRepositoryTrait.php
index 350a621..2823f5e 100644
--- a/app/Parvula/Repositories/PageRepositoryTrait.php
+++ b/core/Repositories/PageRepositoryTrait.php
@@ -2,9 +2,6 @@
 
 namespace Parvula\Repositories;
 
-use Iterator;
-use Parvula\ArrayableInterface;
-use Parvula\Models\Page;
 use Parvula\PageRenderers\PageRendererInterface;
 
 // abstract class PageRepository extends BaseRepository implements Iterator, ArrayableInterface {
diff --git a/app/Parvula/Services/AuthenticationService.php b/core/Services/AuthenticationService.php
similarity index 92%
rename from app/Parvula/Services/AuthenticationService.php
rename to core/Services/AuthenticationService.php
index d3527c6..18cd6b6 100644
--- a/app/Parvula/Services/AuthenticationService.php
+++ b/core/Services/AuthenticationService.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Parvula\Service;
+namespace Parvula\Services;
 
-use Parvula\Models\User;
-
-class AuthenticationService {
+use Parvula\Session;
 
+class AuthenticationService
+{
 	/**
 	 * @var mixed Token
 	 */
diff --git a/app/Parvula/Services/ThemesService.php b/core/Services/ThemesService.php
similarity index 100%
rename from app/Parvula/Services/ThemesService.php
rename to core/Services/ThemesService.php
diff --git a/app/Parvula/Session.php b/core/Session.php
similarity index 100%
rename from app/Parvula/Session.php
rename to core/Session.php
diff --git a/app/Parvula/Transformers/PageHeadTransformer.php b/core/Transformers/PageHeadTransformer.php
similarity index 100%
rename from app/Parvula/Transformers/PageHeadTransformer.php
rename to core/Transformers/PageHeadTransformer.php
diff --git a/app/Parvula/Transformers/Transformer.php b/core/Transformers/Transformer.php
similarity index 100%
rename from app/Parvula/Transformers/Transformer.php
rename to core/Transformers/Transformer.php
diff --git a/app/helpers.php b/core/helpers.php
similarity index 99%
rename from app/helpers.php
rename to core/helpers.php
index 39b1f31..6dcfb8c 100644
--- a/app/helpers.php
+++ b/core/helpers.php
@@ -1,6 +1,6 @@
 <?php
 
-use Parvula\Parvula;
+namespace Parvula;
 
 /**
  * Create multiple class aliases.
diff --git a/public/plugins/Admin/main.php b/public/plugins/Admin/main.php
index ff04bc7..f2a8231 100644
--- a/public/plugins/Admin/main.php
+++ b/public/plugins/Admin/main.php
@@ -1,8 +1,8 @@
 <?php
 
-use Parvula\Parvula;
-use Parvula\Parvula\Core\Config;
-use Parvula\Parvula\Core\Models\Pages;
+use function Parvula\app;
+use function Parvula\url;
+use function Parvula\themesPath;
 
 $templates = new League\Plates\Engine(__DIR__ . '/view', 'html');
 
diff --git a/public/plugins/ComponentsLoader/ComponentsLoader.php b/public/plugins/ComponentsLoader/ComponentsLoader.php
index 8164e4d..f32ca79 100644
--- a/public/plugins/ComponentsLoader/ComponentsLoader.php
+++ b/public/plugins/ComponentsLoader/ComponentsLoader.php
@@ -5,6 +5,7 @@
 use Exception;
 use Parvula\Plugin;
 use Parvula\Models\Page;
+use function Parvula\pluginsPath;
 
 if (!defined('_APP_')) exit;