diff --git a/.gitignore b/.gitignore
index 586796f169..d23e6ac9fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,29 +1,18 @@
 # These files should be explicitly created
 config/database.config.php
+config/flysystem.config.php
 config/proxy.config.php
 config/redis.config.php
 config/sentry.config.php
 config/session.config.php
 
 # We don't want data in our repository
-data/banner/images
-data/br/companies
-data/br/files
 data/cache
-data/calendar/posters
-data/certificates/private
-data/cudi/files
+data/files
 data/hydrators
-data/page/files
 data/proxies
-data/form/files
 
 public/_assetic
-public/_common/profile
-public/_gallery/albums
-public/_publications/pdf
-public/_publications/html
-public/_br/img
 
 # Exclude dependencies
 vendor/
diff --git a/composer.json b/composer.json
index 3f0fe6cf03..5f342962a6 100644
--- a/composer.json
+++ b/composer.json
@@ -39,6 +39,7 @@
         "clue/redis-react": "^2.2",
         "colinmollenhour/credis": "^1.10",
         "erusev/parsedown": "^1.7",
+        "league/flysystem-aws-s3-v3": "^1.0",
         "league/uri-parser": "^1.4",
         "misterion/ko-process": "^0.5",
         "mtdowling/cron-expression": "^1.2",
@@ -49,6 +50,7 @@
         "symfony/console": "^3.4",
         "symfony/event-dispatcher": "^3.4",
         "widmogrod/zf2-assetic-module": "^2.4",
+        "wshafer/psr11-flysystem": "^2.1",
 
         "twitter/bootstrap": "^3.3"
     },
diff --git a/composer.lock b/composer.lock
index 6866a83c4f..de47be318c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "171170e13cd9dc274c8d164c0dd3a8c4",
+    "content-hash": "b2fe634cccc2a8d127162924f13c3f07",
     "packages": [
         {
             "name": "alcaeus/mongo-php-adapter",
@@ -72,6 +72,89 @@
             ],
             "time": "2019-04-06T08:08:09+00:00"
         },
+        {
+            "name": "aws/aws-sdk-php",
+            "version": "3.94.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/aws/aws-sdk-php.git",
+                "reference": "fcc8593b3da8465d1181c73689117d13101a1c9a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/fcc8593b3da8465d1181c73689117d13101a1c9a",
+                "reference": "fcc8593b3da8465d1181c73689117d13101a1c9a",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "ext-pcre": "*",
+                "ext-simplexml": "*",
+                "guzzlehttp/guzzle": "^5.3.3|^6.2.1",
+                "guzzlehttp/promises": "~1.0",
+                "guzzlehttp/psr7": "^1.4.1",
+                "mtdowling/jmespath.php": "~2.2",
+                "php": ">=5.5"
+            },
+            "require-dev": {
+                "andrewsville/php-token-reflection": "^1.4",
+                "aws/aws-php-sns-message-validator": "~1.0",
+                "behat/behat": "~3.0",
+                "doctrine/cache": "~1.4",
+                "ext-dom": "*",
+                "ext-openssl": "*",
+                "ext-pcntl": "*",
+                "ext-sockets": "*",
+                "nette/neon": "^2.3",
+                "phpunit/phpunit": "^4.8.35|^5.4.3",
+                "psr/cache": "^1.0",
+                "psr/simple-cache": "^1.0"
+            },
+            "suggest": {
+                "aws/aws-php-sns-message-validator": "To validate incoming SNS notifications",
+                "doctrine/cache": "To use the DoctrineCacheAdapter",
+                "ext-curl": "To send requests using cURL",
+                "ext-openssl": "Allows working with CloudFront private distributions and verifying received SNS messages",
+                "ext-sockets": "To use client-side monitoring"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Aws\\": "src/"
+                },
+                "files": [
+                    "src/functions.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache-2.0"
+            ],
+            "authors": [
+                {
+                    "name": "Amazon Web Services",
+                    "homepage": "http://aws.amazon.com"
+                }
+            ],
+            "description": "AWS SDK for PHP - Use Amazon Web Services in your PHP project",
+            "homepage": "http://aws.amazon.com/sdkforphp",
+            "keywords": [
+                "amazon",
+                "aws",
+                "cloud",
+                "dynamodb",
+                "ec2",
+                "glacier",
+                "s3",
+                "sdk"
+            ],
+            "time": "2019-05-20T18:14:09+00:00"
+        },
         {
             "name": "cboden/ratchet",
             "version": "v0.4.1",
@@ -1779,6 +1862,122 @@
             ],
             "time": "2017-07-23T21:35:13+00:00"
         },
+        {
+            "name": "guzzlehttp/guzzle",
+            "version": "6.3.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/guzzle/guzzle.git",
+                "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/407b0cb880ace85c9b63c5f9551db498cb2d50ba",
+                "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba",
+                "shasum": ""
+            },
+            "require": {
+                "guzzlehttp/promises": "^1.0",
+                "guzzlehttp/psr7": "^1.4",
+                "php": ">=5.5"
+            },
+            "require-dev": {
+                "ext-curl": "*",
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0",
+                "psr/log": "^1.0"
+            },
+            "suggest": {
+                "psr/log": "Required for using the Log middleware"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "6.3-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "src/functions_include.php"
+                ],
+                "psr-4": {
+                    "GuzzleHttp\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                }
+            ],
+            "description": "Guzzle is a PHP HTTP client library",
+            "homepage": "http://guzzlephp.org/",
+            "keywords": [
+                "client",
+                "curl",
+                "framework",
+                "http",
+                "http client",
+                "rest",
+                "web service"
+            ],
+            "time": "2018-04-22T15:46:56+00:00"
+        },
+        {
+            "name": "guzzlehttp/promises",
+            "version": "v1.3.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/guzzle/promises.git",
+                "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/a59da6cf61d80060647ff4d3eb2c03a2bc694646",
+                "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "GuzzleHttp\\Promise\\": "src/"
+                },
+                "files": [
+                    "src/functions_include.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                }
+            ],
+            "description": "Guzzle promises library",
+            "keywords": [
+                "promise"
+            ],
+            "time": "2016-12-20T10:07:11+00:00"
+        },
         {
             "name": "guzzlehttp/psr7",
             "version": "1.5.2",
@@ -1923,6 +2122,184 @@
             ],
             "time": "2016-11-11T18:43:20+00:00"
         },
+        {
+            "name": "league/flysystem",
+            "version": "1.0.51",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/thephpleague/flysystem.git",
+                "reference": "755ba7bf3fb9031e6581d091db84d78275874396"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/755ba7bf3fb9031e6581d091db84d78275874396",
+                "reference": "755ba7bf3fb9031e6581d091db84d78275874396",
+                "shasum": ""
+            },
+            "require": {
+                "ext-fileinfo": "*",
+                "php": ">=5.5.9"
+            },
+            "conflict": {
+                "league/flysystem-sftp": "<1.0.6"
+            },
+            "require-dev": {
+                "phpspec/phpspec": "^3.4",
+                "phpunit/phpunit": "^5.7.10"
+            },
+            "suggest": {
+                "ext-fileinfo": "Required for MimeType",
+                "ext-ftp": "Allows you to use FTP server storage",
+                "ext-openssl": "Allows you to use FTPS server storage",
+                "league/flysystem-aws-s3-v2": "Allows you to use S3 storage with AWS SDK v2",
+                "league/flysystem-aws-s3-v3": "Allows you to use S3 storage with AWS SDK v3",
+                "league/flysystem-azure": "Allows you to use Windows Azure Blob storage",
+                "league/flysystem-cached-adapter": "Flysystem adapter decorator for metadata caching",
+                "league/flysystem-eventable-filesystem": "Allows you to use EventableFilesystem",
+                "league/flysystem-rackspace": "Allows you to use Rackspace Cloud Files",
+                "league/flysystem-sftp": "Allows you to use SFTP server storage via phpseclib",
+                "league/flysystem-webdav": "Allows you to use WebDAV storage",
+                "league/flysystem-ziparchive": "Allows you to use ZipArchive adapter",
+                "spatie/flysystem-dropbox": "Allows you to use Dropbox storage",
+                "srmklive/flysystem-dropbox-v2": "Allows you to use Dropbox storage for PHP 5 applications"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.1-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "League\\Flysystem\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Frank de Jonge",
+                    "email": "info@frenky.net"
+                }
+            ],
+            "description": "Filesystem abstraction: Many filesystems, one API.",
+            "keywords": [
+                "Cloud Files",
+                "WebDAV",
+                "abstraction",
+                "aws",
+                "cloud",
+                "copy.com",
+                "dropbox",
+                "file systems",
+                "files",
+                "filesystem",
+                "filesystems",
+                "ftp",
+                "rackspace",
+                "remote",
+                "s3",
+                "sftp",
+                "storage"
+            ],
+            "time": "2019-03-30T13:22:34+00:00"
+        },
+        {
+            "name": "league/flysystem-aws-s3-v3",
+            "version": "1.0.22",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/thephpleague/flysystem-aws-s3-v3.git",
+                "reference": "883b02c80ca9cd68cf58a9b4b2185beef24b836b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/883b02c80ca9cd68cf58a9b4b2185beef24b836b",
+                "reference": "883b02c80ca9cd68cf58a9b4b2185beef24b836b",
+                "shasum": ""
+            },
+            "require": {
+                "aws/aws-sdk-php": "^3.0.0",
+                "league/flysystem": "^1.0.40",
+                "php": ">=5.5.0"
+            },
+            "require-dev": {
+                "henrikbjorn/phpspec-code-coverage": "~1.0.1",
+                "phpspec/phpspec": "^2.0.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "League\\Flysystem\\AwsS3v3\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Frank de Jonge",
+                    "email": "info@frenky.net"
+                }
+            ],
+            "description": "Flysystem adapter for the AWS S3 SDK v3.x",
+            "time": "2019-01-31T15:07:25+00:00"
+        },
+        {
+            "name": "league/flysystem-cached-adapter",
+            "version": "1.0.9",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/thephpleague/flysystem-cached-adapter.git",
+                "reference": "08ef74e9be88100807a3b92cc9048a312bf01d6f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/thephpleague/flysystem-cached-adapter/zipball/08ef74e9be88100807a3b92cc9048a312bf01d6f",
+                "reference": "08ef74e9be88100807a3b92cc9048a312bf01d6f",
+                "shasum": ""
+            },
+            "require": {
+                "league/flysystem": "~1.0",
+                "psr/cache": "^1.0.0"
+            },
+            "require-dev": {
+                "mockery/mockery": "~0.9",
+                "phpspec/phpspec": "^3.4",
+                "phpunit/phpunit": "^5.7",
+                "predis/predis": "~1.0",
+                "tedivm/stash": "~0.12"
+            },
+            "suggest": {
+                "ext-phpredis": "Pure C implemented extension for PHP"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "League\\Flysystem\\Cached\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "frankdejonge",
+                    "email": "info@frenky.net"
+                }
+            ],
+            "description": "An adapter decorator to enable meta-data caching.",
+            "time": "2018-07-09T20:51:04+00:00"
+        },
         {
             "name": "league/uri-parser",
             "version": "1.4.1",
@@ -2159,6 +2536,61 @@
             ],
             "time": "2017-01-23T04:29:33+00:00"
         },
+        {
+            "name": "mtdowling/jmespath.php",
+            "version": "2.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/jmespath/jmespath.php.git",
+                "reference": "adcc9531682cf87dfda21e1fd5d0e7a41d292fac"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/jmespath/jmespath.php/zipball/adcc9531682cf87dfda21e1fd5d0e7a41d292fac",
+                "reference": "adcc9531682cf87dfda21e1fd5d0e7a41d292fac",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.4.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.0"
+            },
+            "bin": [
+                "bin/jp.php"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "JmesPath\\": "src/"
+                },
+                "files": [
+                    "src/JmesPath.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                }
+            ],
+            "description": "Declaratively specify how to extract elements from a JSON document",
+            "keywords": [
+                "json",
+                "jsonpath"
+            ],
+            "time": "2016-12-03T22:08:25+00:00"
+        },
         {
             "name": "ocramius/package-versions",
             "version": "1.4.0",
@@ -4057,6 +4489,67 @@
             ],
             "time": "2018-01-13T15:39:38+00:00"
         },
+        {
+            "name": "wshafer/psr11-flysystem",
+            "version": "2.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/wshafer/psr11-flysystem.git",
+                "reference": "8d6fdddc910ddd48124b949eb916fa31b23b283c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/wshafer/psr11-flysystem/zipball/8d6fdddc910ddd48124b949eb916fa31b23b283c",
+                "reference": "8d6fdddc910ddd48124b949eb916fa31b23b283c",
+                "shasum": ""
+            },
+            "require": {
+                "league/flysystem": "^1.0.40",
+                "league/flysystem-cached-adapter": "^1.0",
+                "php": "^7.0",
+                "psr/container": "^1.0.0"
+            },
+            "require-dev": {
+                "league/flysystem-aws-s3-v3": "^1.0",
+                "league/flysystem-azure": "^1.0",
+                "league/flysystem-memory": "^1.0",
+                "league/flysystem-sftp": "^1.0",
+                "league/flysystem-ziparchive": "^1.0",
+                "phpmd/phpmd": "@stable",
+                "phpunit/phpunit": "^6.0.8",
+                "predis/predis": "^1.1",
+                "satooshi/php-coveralls": "^1.0",
+                "spatie/flysystem-dropbox": "^1.0",
+                "squizlabs/php_codesniffer": "^2.8.1",
+                "symfony/dependency-injection": "^3.3"
+            },
+            "type": "library",
+            "extra": {
+                "zf": {
+                    "config-provider": "WShafer\\PSR11FlySystem\\ConfigProvider",
+                    "module": "WShafer\\PSR11FlySystem"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "WShafer\\PSR11FlySystem\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-2-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Westin Shafer",
+                    "email": "shafer_w2002@yahoo.com",
+                    "homepage": "https://github.com/wshafer"
+                }
+            ],
+            "description": "Flysystem Facotories for PSR-11",
+            "homepage": "https://github.com/wshafer/psr11-flysystem",
+            "time": "2017-09-14T23:03:04+00:00"
+        },
         {
             "name": "zendframework/zend-authentication",
             "version": "2.6.0",
diff --git a/config/autoload/flysystem.global.php b/config/autoload/flysystem.global.php
new file mode 100644
index 0000000000..8c92ee25d3
--- /dev/null
+++ b/config/autoload/flysystem.global.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Litus is a project by a group of students from the KU Leuven. The goal is to create
+ * various applications to support the IT needs of student unions.
+ *
+ * @author Niels Avonds <niels.avonds@litus.cc>
+ * @author Karsten Daemen <karsten.daemen@litus.cc>
+ * @author Koen Certyn <koen.certyn@litus.cc>
+ * @author Bram Gotink <bram.gotink@litus.cc>
+ * @author Dario Incalza <dario.incalza@litus.cc>
+ * @author Pieter Maene <pieter.maene@litus.cc>
+ * @author Kristof Mariën <kristof.marien@litus.cc>
+ * @author Lars Vierbergen <lars.vierbergen@litus.cc>
+ * @author Daan Wendelen <daan.wendelen@litus.cc>
+ * @author Mathijs Cuppens <mathijs.cuppens@litus.cc>
+ * @author Floris Kint <floris.kint@vtk.be>
+ *
+ * @license http://litus.cc/LICENSE
+ */
+
+if (!file_exists(__DIR__ . '/../flysystem.config.php')) {
+    throw new RuntimeException(
+        'The FlySystem configuration file (' . (__DIR__ . '/../flysystem.config.php') . ') was not found'
+    );
+}
+
+$flysystemConfig = include __DIR__ . '/../flysystem.config.php';
+
+return array(
+    'flysystem' => array(
+        'adaptors' => array(
+            'default' => array(
+                'type'    => $flysystemConfig['type'],
+                'options' => $flysystemConfig['options'],
+            ),
+        ),
+    ),
+);
diff --git a/config/autoload/proxy.global.php b/config/autoload/proxy.global.php
index c3b1d789ce..dc76aac201 100644
--- a/config/autoload/proxy.global.php
+++ b/config/autoload/proxy.global.php
@@ -27,7 +27,7 @@
 $proxyConfig = include __DIR__ . '/../proxy.config.php';
 if ($proxyConfig['use_proxy'] && !isset($proxyConfig['trusted_proxies'])) {
     throw new RuntimeException(
-        'The RemoteAddr configuration did not specify any trusted proxies'
+        'The proxy configuration did not specify any trusted proxies'
     );
 }
 
diff --git a/config/autoload/zenddevelopertools.global.php b/config/autoload/zenddevelopertools.global.php
index 53e715b98b..1984171a7a 100644
--- a/config/autoload/zenddevelopertools.global.php
+++ b/config/autoload/zenddevelopertools.global.php
@@ -18,25 +18,29 @@
  * @license http://litus.cc/LICENSE
  */
 
-return array(
-    'zenddevelopertools' => array(
-        'profiler' => array(
-            'enabled'     => true,
-            'strict'      => false,
-            'flush_early' => false,
-            'cache_dir'   => 'data/cache',
-            'matcher'     => array(),
-            'collectors'  => array(
-                'config' => null,
-                'db'     => null,
+if (getenv('APPLICATION_ENV') == 'development') {
+    return array(
+        'zenddevelopertools' => array(
+            'profiler' => array(
+                'enabled'     => true,
+                'strict'      => false,
+                'flush_early' => false,
+                'cache_dir'   => 'data/cache',
+                'matcher'     => array(),
+                'collectors'  => array(
+                    'config' => null,
+                    'db'     => null,
+                ),
+            ),
+            'toolbar' => array(
+                'enabled'       => getenv('APPLICATION_ENV') == 'development',
+                'auto_hide'     => true,
+                'position'      => 'bottom',
+                'version_check' => true,
+                'entries'       => array(),
             ),
         ),
-        'toolbar' => array(
-            'enabled'       => getenv('APPLICATION_ENV') == 'development',
-            'auto_hide'     => true,
-            'position'      => 'bottom',
-            'version_check' => true,
-            'entries'       => array(),
-        ),
-    ),
-);
+    );
+}
+
+return array();
diff --git a/config/flysystem.config.php.dist b/config/flysystem.config.php.dist
new file mode 100644
index 0000000000..ae0fb86c1a
--- /dev/null
+++ b/config/flysystem.config.php.dist
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Litus is a project by a group of students from the KU Leuven. The goal is to create
+ * various applications to support the IT needs of student unions.
+ *
+ * @author Niels Avonds <niels.avonds@litus.cc>
+ * @author Karsten Daemen <karsten.daemen@litus.cc>
+ * @author Koen Certyn <koen.certyn@litus.cc>
+ * @author Bram Gotink <bram.gotink@litus.cc>
+ * @author Dario Incalza <dario.incalza@litus.cc>
+ * @author Pieter Maene <pieter.maene@litus.cc>
+ * @author Kristof Mariën <kristof.marien@litus.cc>
+ * @author Lars Vierbergen <lars.vierbergen@litus.cc>
+ * @author Daan Wendelen <daan.wendelen@litus.cc>
+ * @author Mathijs Cuppens <mathijs.cuppens@litus.cc>
+ * @author Floris Kint <floris.kint@vtk.be>
+ *
+ * @license http://litus.cc/LICENSE
+ */
+
+return array(
+    'type'    => 'local',
+    'options' => array(
+        'root' => __DIR__ . '/../data/files',
+    ),
+);
diff --git a/config/modules.config.php b/config/modules.config.php
index a4ef1b8435..903760e763 100644
--- a/config/modules.config.php
+++ b/config/modules.config.php
@@ -35,6 +35,7 @@
     'DoctrineModule',
     'DoctrineORMModule',
     'DoctrineMongoODMModule',
+    'WShafer\PSR11FlySystem',
     'ZendTwig',
 
     'ApiBundle',
diff --git a/data/br/files/.gitignore b/data/br/files/.gitignore
deleted file mode 100644
index d6b7ef32c8..0000000000
--- a/data/br/files/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/data/br/files/contracts/.gitignore b/data/br/files/contracts/.gitignore
deleted file mode 100644
index d6b7ef32c8..0000000000
--- a/data/br/files/contracts/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/data/br/files/cv/.gitignore b/data/br/files/cv/.gitignore
deleted file mode 100644
index d6b7ef32c8..0000000000
--- a/data/br/files/cv/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/data/calendar/posters/.gitignore b/data/calendar/posters/.gitignore
deleted file mode 100644
index d6b7ef32c8..0000000000
--- a/data/calendar/posters/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/data/banner/images/.gitignore b/data/files/.gitignore
similarity index 100%
rename from data/banner/images/.gitignore
rename to data/files/.gitignore
diff --git a/migrations/Version20190714140819.php b/migrations/Version20190714140819.php
new file mode 100644
index 0000000000..46bb7f3892
--- /dev/null
+++ b/migrations/Version20190714140819.php
@@ -0,0 +1,55 @@
+<?php
+declare(strict_types=1);
+
+/**
+ * Litus is a project by a group of students from the KU Leuven. The goal is to create
+ * various applications to support the IT needs of student unions.
+ *
+ * @author Niels Avonds <niels.avonds@litus.cc>
+ * @author Karsten Daemen <karsten.daemen@litus.cc>
+ * @author Koen Certyn <koen.certyn@litus.cc>
+ * @author Bram Gotink <bram.gotink@litus.cc>
+ * @author Dario Incalza <dario.incalza@litus.cc>
+ * @author Pieter Maene <pieter.maene@litus.cc>
+ * @author Kristof Mariën <kristof.marien@litus.cc>
+ * @author Lars Vierbergen <lars.vierbergen@litus.cc>
+ * @author Daan Wendelen <daan.wendelen@litus.cc>
+ * @author Mathijs Cuppens <mathijs.cuppens@litus.cc>
+ * @author Floris Kint <floris.kint@vtk.be>
+ *
+ * @license http://litus.cc/LICENSE
+ */
+
+namespace Migrations;
+
+use Doctrine\DBAL\Schema\Schema;
+
+/**
+ * Version 20190714140819
+ */
+class Version20190714140819 extends \Doctrine\Migrations\AbstractMigration
+{
+    /**
+     * @param  \Doctrine\DBAL\Schema\Schema $schema
+     * @return void
+     */
+    public function up(Schema $schema) : void
+    {
+        $this->abortIf(
+            $this->connection->getDatabasePlatform()->getName() !== 'postgresql',
+            'Migration can only be executed safely on PostgreSQL.'
+        );
+
+        $this->addSql('ALTER TABLE nodes_banners ALTER image TYPE VARCHAR(255)');
+        $this->addSql('ALTER TABLE nodes_banners ALTER image DROP DEFAULT');
+    }
+
+    /**
+     * @param  \Doctrine\DBAL\Schema\Schema $schema
+     * @return void
+     */
+    public function down(Schema $schema) : void
+    {
+        $this->throwIrreversibleMigrationException();
+    }
+}
diff --git a/migrations/Version20190714140846.php b/migrations/Version20190714140846.php
new file mode 100644
index 0000000000..806dffa854
--- /dev/null
+++ b/migrations/Version20190714140846.php
@@ -0,0 +1,95 @@
+<?php
+declare(strict_types=1);
+
+/**
+ * Litus is a project by a group of students from the KU Leuven. The goal is to create
+ * various applications to support the IT needs of student unions.
+ *
+ * @author Niels Avonds <niels.avonds@litus.cc>
+ * @author Karsten Daemen <karsten.daemen@litus.cc>
+ * @author Koen Certyn <koen.certyn@litus.cc>
+ * @author Bram Gotink <bram.gotink@litus.cc>
+ * @author Dario Incalza <dario.incalza@litus.cc>
+ * @author Pieter Maene <pieter.maene@litus.cc>
+ * @author Kristof Mariën <kristof.marien@litus.cc>
+ * @author Lars Vierbergen <lars.vierbergen@litus.cc>
+ * @author Daan Wendelen <daan.wendelen@litus.cc>
+ * @author Mathijs Cuppens <mathijs.cuppens@litus.cc>
+ * @author Floris Kint <floris.kint@vtk.be>
+ *
+ * @license http://litus.cc/LICENSE
+ */
+
+namespace Migrations;
+
+use CommonBundle\Component\ServiceManager\ServiceLocatorAwareInterface;
+use CommonBundle\Component\ServiceManager\ServiceLocatorAwareTrait;
+use Doctrine\DBAL\Schema\Schema;
+
+/**
+ * Version 20190714140846
+ */
+class Version20190714140846 extends \Doctrine\Migrations\AbstractMigration implements ServiceLocatorAwareInterface
+{
+    use ServiceLocatorAwareTrait;
+
+    /**
+     * @param  \Doctrine\DBAL\Schema\Schema $schema
+     * @return void
+     */
+    public function up(Schema $schema) : void
+    {
+        $this->abortIf(
+            $this->connection->getDatabasePlatform()->getName() !== 'postgresql',
+            'Migration can only be executed safely on PostgreSQL.'
+        );
+
+        $this->addSql('ALTER TABLE br_invoices_history ADD file VARCHAR(255) NULL');
+        $this->addSql('ALTER TABLE br_invoices_manual ADD file VARCHAR(255) DEFAULT \'\' NOT NULL');
+    }
+
+    /**
+     * @param  \Doctrine\DBAL\Schema\Schema $schema
+     * @return void
+     */
+    public function down(Schema $schema) : void
+    {
+        $this->throwIrreversibleMigrationException();
+    }
+
+    /**
+     * @param  \Doctrine\DBAL\Schema\Schema $schema
+     * @return void
+     */
+    public function postUp(Schema $schema) : void
+    {
+        $config = $this->getServiceLocator()->get('config');
+        $filesystem = $this->getServiceLocator()->get('filesystem');
+        $directory = $config['litus']['storage']['directories']['br_invoices_manual'];
+
+        $entities = $this->getServiceLocator()
+            ->get('doctrine.entitymanager.orm_default')
+            ->getRepository('BrBundle\Entity\Invoice\Manual')
+            ->findAll();
+
+        foreach ($entities as $entity) {
+            $from = $directory
+                . '/' . $entity->getInvoiceNumberPrefix()
+                . '/' . $entity->getInvoiceNumber() . '.pdf';
+
+            if ($filesystem->has($from)) {
+                do {
+                    $file = sha1(uniqid());
+                    $to = $directory . '/' . $file;
+                } while ($filesystem->has($to));
+
+                $entity->setFile($file);
+                $filesystem->rename($from, $to);
+            }
+        }
+
+        $this->getServiceLocator()
+            ->get('doctrine.entitymanager.orm_default')
+            ->flush();
+    }
+}
diff --git a/migrations/Version20190714195804.php b/migrations/Version20190714195804.php
new file mode 100644
index 0000000000..1c48901402
--- /dev/null
+++ b/migrations/Version20190714195804.php
@@ -0,0 +1,51 @@
+<?php
+declare(strict_types=1);
+
+/**
+ * Litus is a project by a group of students from the KU Leuven. The goal is to create
+ * various applications to support the IT needs of student unions.
+ *
+ * @author Niels Avonds <niels.avonds@litus.cc>
+ * @author Karsten Daemen <karsten.daemen@litus.cc>
+ * @author Koen Certyn <koen.certyn@litus.cc>
+ * @author Bram Gotink <bram.gotink@litus.cc>
+ * @author Dario Incalza <dario.incalza@litus.cc>
+ * @author Pieter Maene <pieter.maene@litus.cc>
+ * @author Kristof Mariën <kristof.marien@litus.cc>
+ * @author Lars Vierbergen <lars.vierbergen@litus.cc>
+ * @author Daan Wendelen <daan.wendelen@litus.cc>
+ * @author Mathijs Cuppens <mathijs.cuppens@litus.cc>
+ * @author Floris Kint <floris.kint@vtk.be>
+ *
+ * @license http://litus.cc/LICENSE
+ */
+
+namespace Migrations;
+
+use Doctrine\DBAL\Schema\Schema;
+
+/**
+ * Version 20190714195804
+ */
+class Version20190714195804 extends \Doctrine\Migrations\AbstractMigration
+{
+    /**
+     * @param  \Doctrine\DBAL\Schema\Schema $schema
+     * @return void
+     */
+    public function up(Schema $schema) : void
+    {
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+
+        $this->addSql('ALTER TABLE br_companies_logos RENAME COLUMN path TO image');
+    }
+
+    /**
+     * @param  \Doctrine\DBAL\Schema\Schema $schema
+     * @return void
+     */
+    public function down(Schema $schema) : void
+    {
+        $this->throwIrreversibleMigrationException();
+    }
+}
diff --git a/module/ApiBundle/Controller/CalendarController.php b/module/ApiBundle/Controller/CalendarController.php
index 48e10f6223..485972eb19 100644
--- a/module/ApiBundle/Controller/CalendarController.php
+++ b/module/ApiBundle/Controller/CalendarController.php
@@ -20,6 +20,7 @@
 
 namespace ApiBundle\Controller;
 
+use CommonBundle\Component\Util\File\TmpFile;
 use Imagick;
 use Zend\View\Model\ViewModel;
 
@@ -68,27 +69,18 @@ public function posterAction()
             return $this->error(404, 'No poster key was provided with the request');
         }
 
-        $filePath = $this->getEntityManager()
-            ->getRepository('CommonBundle\Entity\General\Config')
-            ->getConfigValue('calendar.poster_path') . '/';
-
-        if (!file_exists($filePath . $poster)) {
-            return $this->error(404, 'The poster file does not exist');
-        }
+        $path = $this->getStoragePath(
+            'calendar_events_posters',
+            $poster
+        );
 
-        if (!file_exists($filePath . $poster . '_thumb')) {
-            $image = new Imagick($filePath . $poster);
-            $image->scaleImage(1136, 1136, true);
-            $image->writeImage($filePath . $poster . '_thumb');
+        if (!$this->getFilesystem()->has($path)) {
+            return $this->error(404, 'The requested poster does not exist');
         }
 
-        $handle = fopen($filePath . $poster . '_thumb', 'r');
-        $data = base64_encode(fread($handle, filesize($filePath . $poster . '_thumb')));
-        fclose($handle);
-
         $result = array(
-            'mime_type' => mime_content_type($filePath . $poster),
-            'data'      => $data,
+            'mime_type' => $this->getFilesystem()->getMimetype($path),
+            'data'      => base64_encode($this->getFilesystem()->read($path)),
         );
 
         return new ViewModel(
@@ -103,11 +95,6 @@ public function posterAction()
      */
     private function getPoster()
     {
-        $poster = $this->getRequest()->getQuery('poster');
-        if (is_string($poster)) {
-            return $poster;
-        }
-
-        return null;
+        return $this->getRequest()->getQuery('poster');
     }
 }
diff --git a/module/BannerBundle/Controller/Admin/BannerController.php b/module/BannerBundle/Controller/Admin/BannerController.php
index 3171e33626..dc5a507420 100644
--- a/module/BannerBundle/Controller/Admin/BannerController.php
+++ b/module/BannerBundle/Controller/Admin/BannerController.php
@@ -95,28 +95,28 @@ public function editAction()
 
     private function receive($file, Banner $banner)
     {
-        $filePath = $this->getEntityManager()
-            ->getRepository('CommonBundle\Entity\General\Config')
-            ->getConfigValue('banner.image_path');
-
         do {
-            $fileName = '/' . sha1(uniqid());
-        } while (file_exists($filePath . $fileName));
-
-        rename($file['tmp_name'], $filePath . $fileName);
+            $image = sha1(uniqid());
+            $path = $this->getStoragePath('banner_banners_images', $image);
+        } while ($this->getFilesystem()->has($path));
+
+        $stream = fopen($file['tmp_name'], 'r+');
+        $this->getFilesystem()->writeStream($path, $stream);
+        if (is_resource($stream)) {
+            fclose($stream);
+        }
 
-        $banner->setImage($fileName);
+        $banner->setImage($image);
     }
 
     public function uploadAction()
     {
         $this->initAjax();
 
-        $isNew = !($banner = $this->getBannerEntity(false));
+        $form = $this->getForm('banner_banner_add');
 
-        if ($isNew) {
-            $form = $this->getForm('banner_banner_add');
-        } else {
+        $banner = $this->getEntityById('BannerBundle\Entity\Node\Banner');
+        if ($banner !== null) {
             $form = $this->getForm('banner_banner_edit', $banner);
         }
 
@@ -131,7 +131,7 @@ public function uploadAction()
             if ($form->isValid()) {
                 $formData = $form->getData();
 
-                if ($isNew) {
+                if ($banner === null) {
                     $banner = $form->hydrateObject();
 
                     $this->receive($formData['file'], $banner);
@@ -154,8 +154,17 @@ public function uploadAction()
                             ),
                         )
                     );
-                } elseif (!$isNew) {
+                } else {
                     if (isset($formData['file'])) {
+                        $path = $this->getStoragePath(
+                            'banner_banners_images',
+                            $banner->getImage()
+                        );
+
+                        if ($this->getFilesystem()->has($path)) {
+                            $this->getFilesystem()->delete($path);
+                        }
+
                         $this->receive($formData['file'], $banner);
                     }
 
@@ -208,6 +217,10 @@ public function deleteAction()
             return new ViewModel();
         }
 
+        $this->getFilesystem()->delete(
+            Banner::getImagePath($banner->getImage())
+        );
+
         $this->getEntityManager()->remove($banner);
         $this->getEntityManager()->flush();
 
@@ -221,27 +234,24 @@ public function deleteAction()
     }
 
     /**
-     * @param  boolean $redirect
      * @return Banner|null
      */
-    private function getBannerEntity($redirect = true)
+    private function getBannerEntity()
     {
         $banner = $this->getEntityById('BannerBundle\Entity\Node\Banner');
 
         if (!($banner instanceof Banner)) {
-            if ($redirect) {
-                $this->flashMessenger()->error(
-                    'Error',
-                    'No baner was found!'
-                );
+            $this->flashMessenger()->error(
+                'Error',
+                'No banner was found!'
+            );
 
-                $this->redirect()->toRoute(
-                    'banner_admin_banner',
-                    array(
-                        'action' => 'manage',
-                    )
-                );
-            }
+            $this->redirect()->toRoute(
+                'banner_admin_banner',
+                array(
+                    'action' => 'manage',
+                )
+            );
 
             return;
         }
diff --git a/module/BannerBundle/Controller/BannerController.php b/module/BannerBundle/Controller/BannerController.php
index 3b7e7e85ae..db699c3dae 100644
--- a/module/BannerBundle/Controller/BannerController.php
+++ b/module/BannerBundle/Controller/BannerController.php
@@ -34,27 +34,28 @@ class BannerController extends \CommonBundle\Component\Controller\ActionControll
 {
     public function viewAction()
     {
-        $imagePath = $this->getEntityManager()
-            ->getRepository('CommonBundle\Entity\General\Config')
-            ->getConfigValue('banner.image_path') . '/' . $this->getParam('image');
+        $path = $this->getStoragePath(
+            'banner_banners_images',
+            $this->getParam('image')
+        );
+
+        if (!$this->getFilesystem()->has($path)) {
+            return $this->notFoundAction();
+        }
 
         $headers = new Headers();
         $headers->addHeaders(
             array(
                 'Content-Disposition' => 'inline; filename="' . $this->getParam('image') . '"',
-                'Content-Type'        => mime_content_type($imagePath),
-                'Content-Length'      => filesize($imagePath),
+                'Content-Type'        => $this->getFilesystem()->getMimetype($path),
+                'Content-Length'      => $this->getFilesystem()->getSize($path),
             )
         );
         $this->getResponse()->setHeaders($headers);
 
-        $handle = fopen($imagePath, 'r');
-        $data = fread($handle, filesize($imagePath));
-        fclose($handle);
-
         return new ViewModel(
             array(
-                'data' => $data,
+                'data' => $this->getFilesystem()->read($path),
             )
         );
     }
diff --git a/module/BannerBundle/Entity/Node/Banner.php b/module/BannerBundle/Entity/Node/Banner.php
index 003c2be60d..34168371cf 100644
--- a/module/BannerBundle/Entity/Node/Banner.php
+++ b/module/BannerBundle/Entity/Node/Banner.php
@@ -53,9 +53,9 @@ class Banner extends \CommonBundle\Entity\Node
     private $endDate;
 
     /**
-     * @var string The location of the image
+     * @var string The name of the image
      *
-     * @ORM\Column(type="text")
+     * @ORM\Column(type="string")
      */
     private $image;
 
diff --git a/module/BannerBundle/Resources/config/storage.config.php b/module/BannerBundle/Resources/config/storage.config.php
new file mode 100644
index 0000000000..8655d8ceb0
--- /dev/null
+++ b/module/BannerBundle/Resources/config/storage.config.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Litus is a project by a group of students from the KU Leuven. The goal is to create
+ * various applications to support the IT needs of student unions.
+ *
+ * @author Niels Avonds <niels.avonds@litus.cc>
+ * @author Karsten Daemen <karsten.daemen@litus.cc>
+ * @author Koen Certyn <koen.certyn@litus.cc>
+ * @author Bram Gotink <bram.gotink@litus.cc>
+ * @author Dario Incalza <dario.incalza@litus.cc>
+ * @author Pieter Maene <pieter.maene@litus.cc>
+ * @author Kristof Mariën <kristof.marien@litus.cc>
+ * @author Lars Vierbergen <lars.vierbergen@litus.cc>
+ * @author Daan Wendelen <daan.wendelen@litus.cc>
+ * @author Mathijs Cuppens <mathijs.cuppens@litus.cc>
+ * @author Floris Kint <floris.kint@vtk.be>
+ *
+ * @license http://litus.cc/LICENSE
+ */
+
+return array(
+    'directories' => array(
+        'banner_banners_images' => 'banner/banners_images',
+    ),
+);
diff --git a/module/BannerBundle/Resources/views/banner/admin/banner/add.twig b/module/BannerBundle/Resources/views/banner/admin/banner/add.twig
index 6737980b7a..9146211300 100644
--- a/module/BannerBundle/Resources/views/banner/admin/banner/add.twig
+++ b/module/BannerBundle/Resources/views/banner/admin/banner/add.twig
@@ -25,7 +25,7 @@
                 </div>
                 <div class="modal-body">
                     <p>
-                        Your files are being uploaded.
+                        Your file is being uploaded.
                     </p>
                     <p>
                         <div class="progress progress-striped active">
diff --git a/module/BrBundle/Component/Document/Generator/Pdf/Contract.php b/module/BrBundle/Component/Document/Generator/Pdf/Contract.php
index ab38dd98e8..2c5aeea98b 100644
--- a/module/BrBundle/Component/Document/Generator/Pdf/Contract.php
+++ b/module/BrBundle/Component/Document/Generator/Pdf/Contract.php
@@ -27,7 +27,7 @@
 use CommonBundle\Component\Util\Xml\Node as XmlNode;
 use Doctrine\ORM\EntityManager;
 use IntlDateFormatter;
-use Zend\I18n\Translator\TranslatorInterface;
+use Zend\Mvc\I18n\Translator;
 
 /**
  * Generate a PDF for a contract.
@@ -45,29 +45,30 @@ class Contract extends \CommonBundle\Component\Document\Generator\Pdf
     private $contract;
 
     /**
-     * @var TranslatorInterface
+     * @var Translator
      */
     private $translator;
 
     /**
-     * @param EntityManager       $entityManager The EntityManager instance
-     * @param ContractEntity      $contract      The contract for which we want to generate a PDF
-     * @param TranslatorInterface $translator
+     * @param EntityManager  $entityManager The EntityManager instance
+     * @param ContractEntity $contract      The contract for which we want to generate a PDF
+     * @param TmpFile        $file          The file to write to
+     * @param Translator     $translator    The translator
      */
-    public function __construct(EntityManager $entityManager, ContractEntity $contract, TranslatorInterface $translator)
+    public function __construct(EntityManager $entityManager, ContractEntity $contract, TmpFile $file, Translator $translator)
     {
+        $filePath = $entityManager
+            ->getRepository('CommonBundle\Entity\General\Config')
+            ->getConfigValue('br.pdf_generator_path');
+
         parent::__construct(
             $entityManager,
-            $entityManager
-                ->getRepository('CommonBundle\Entity\General\Config')
-                ->getConfigValue('br.pdf_generator_path') . '/contract/contract.xsl',
-            $entityManager
-                ->getRepository('CommonBundle\Entity\General\Config')
-                ->getConfigValue('br.file_path') . '/contracts/'
-                . $contract->getId() . '/contract.pdf'
+            $filePath . '/contract/contract.xsl',
+            $file->getFilename()
         );
-        $this->translator = $translator;
+
         $this->contract = $contract;
+        $this->translator = $translator;
     }
 
     /**
diff --git a/module/BrBundle/Component/Document/Generator/Pdf/CvBook.php b/module/BrBundle/Component/Document/Generator/Pdf/Cv/Book.php
similarity index 95%
rename from module/BrBundle/Component/Document/Generator/Pdf/CvBook.php
rename to module/BrBundle/Component/Document/Generator/Pdf/Cv/Book.php
index 314abba4bc..0a32318ead 100644
--- a/module/BrBundle/Component/Document/Generator/Pdf/CvBook.php
+++ b/module/BrBundle/Component/Document/Generator/Pdf/Cv/Book.php
@@ -18,7 +18,7 @@
  * @license http://litus.cc/LICENSE
  */
 
-namespace BrBundle\Component\Document\Generator\Pdf;
+namespace BrBundle\Component\Document\Generator\Pdf\Cv;
 
 use BrBundle\Component\Util\Cv;
 use CommonBundle\Component\Util\File\TmpFile;
@@ -29,11 +29,11 @@
 use Zend\Mvc\I18n\Translator;
 
 /**
- * Generates the CV Book for one academic year.
+ * Generate the CV Book for one academic year.
  *
  * @author Niels Avonds <niels.avonds@litus.cc>
  */
-class CvBook extends \CommonBundle\Component\Document\Generator\Pdf
+class Book extends \CommonBundle\Component\Document\Generator\Pdf
 {
     /**
      * @var AcademicYear
diff --git a/module/BrBundle/Component/Document/Generator/Pdf/Cv.php b/module/BrBundle/Component/Document/Generator/Pdf/Cv/Single.php
similarity index 93%
rename from module/BrBundle/Component/Document/Generator/Pdf/Cv.php
rename to module/BrBundle/Component/Document/Generator/Pdf/Cv/Single.php
index a999a894f0..24dd4364fa 100644
--- a/module/BrBundle/Component/Document/Generator/Pdf/Cv.php
+++ b/module/BrBundle/Component/Document/Generator/Pdf/Cv/Single.php
@@ -18,7 +18,7 @@
  * @license http://litus.cc/LICENSE
  */
 
-namespace BrBundle\Component\Document\Generator\Pdf;
+namespace BrBundle\Component\Document\Generator\Pdf\Cv;
 
 use BrBundle\Component\Util\Cv as CvUtil;
 use BrBundle\Entity\Cv\Entry;
@@ -29,11 +29,11 @@
 use Zend\Mvc\I18n\Translator;
 
 /**
- * Generates the CV Book for one academic year.
+ * Generate a PDF for a single CV.
  *
  * @author Niels Avonds <niels.avonds@litus.cc>
  */
-class Cv extends \CommonBundle\Component\Document\Generator\Pdf
+class Single extends \CommonBundle\Component\Document\Generator\Pdf
 {
     /**
      * @var Entry
@@ -64,7 +64,6 @@ public function __construct(EntityManager $entityManager, Entry $entry, TmpFile
         );
 
         $this->entry = $entry;
-
         $this->translator = $translator;
     }
 
diff --git a/module/BrBundle/Component/Document/Generator/Pdf/Invoice.php b/module/BrBundle/Component/Document/Generator/Pdf/Invoice.php
index 4db7bb3d8a..30afb1b7f9 100644
--- a/module/BrBundle/Component/Document/Generator/Pdf/Invoice.php
+++ b/module/BrBundle/Component/Document/Generator/Pdf/Invoice.php
@@ -20,7 +20,7 @@
 
 namespace BrBundle\Component\Document\Generator\Pdf;
 
-use BrBundle\Entity\Invoice\Contract as ContractInvoice;
+use BrBundle\Entity\Invoice as InvoiceEntity;
 use CommonBundle\Component\Document\Generator\Pdf as PdfGenerator;
 use CommonBundle\Component\Util\File\TmpFile;
 use CommonBundle\Component\Util\Xml\Generator as XmlGenerator;
@@ -44,7 +44,7 @@ class Invoice extends \CommonBundle\Component\Document\Generator\Pdf
     /**
      * @var string The language used for the invoice
      */
-    private $lang = 'nl';
+    private $language = 'nl';
 
     /**
      * @var String The xsl file path, relative to the br generator path, to use for each language
@@ -56,26 +56,26 @@ class Invoice extends \CommonBundle\Component\Document\Generator\Pdf
     );
 
     /**
-     * @param \Doctrine\ORM\EntityManager       $entityManager The EntityManager instance
-     * @param \BrBundle\Entity\Invoice\Contract $invoice       The invoice for which we want to generate a PDF
-     * @param string                            $language      The language we want to generate the PDF in
+     * @param \Doctrine\ORM\EntityManager               $entityManager The EntityManager instance
+     * @param \BrBundle\Entity\Invoice                  $invoice       The invoice for which we want to generate a PDF
+     * @param \CommonBundle\Component\Util\File\TmpFile $file          The file to write to
+     * @param string                                    $language      The language we want to generate the PDF in
      */
-    public function __construct(EntityManager $entityManager, ContractInvoice $invoice, String $language = null)
+    public function __construct(EntityManager $entityManager, InvoiceEntity $invoice, TmpFile $file, $language = null)
     {
+        $filePath = $entityManager
+            ->getRepository('CommonBundle\Entity\General\Config')
+            ->getConfigValue('br.pdf_generator_path');
+
         parent::__construct(
             $entityManager,
-            $entityManager
-                ->getRepository('CommonBundle\Entity\General\Config')
-                ->getConfigValue('br.pdf_generator_path') . Invoice::INVOICE_XSL_PATHS[$language],
-            $entityManager
-                ->getRepository('CommonBundle\Entity\General\Config')
-                ->getConfigValue('br.file_path') . '/invoices/'
-                . $invoice->getInvoiceNumberPrefix() . '/'
-                . $invoice->getInvoiceNumber() . '.pdf'
+            $filePath . Invoice::INVOICE_XSL_PATHS[$language],
+            $file->getFilename()
         );
+
         $this->invoice = $invoice;
         if ($language !== null) {
-            $this->lang = $language;
+            $this->language = $language;
         }
     }
 
@@ -107,7 +107,7 @@ protected function generateXml(TmpFile $file)
             $vatTypeExplanation = $configs->getConfigValue('br.invoice_vat_explanation') . ' ' . $this->invoice->getVatContext();
         }
 
-        $subEntries = unserialize($configs->getConfigValue('br.invoice_below_entries'))[$this->lang];
+        $subEntries = unserialize($configs->getConfigValue('br.invoice_below_entries'))[$this->language];
 
         $vatTypes = unserialize($configs->getConfigValue('br.vat_types'));
 
diff --git a/module/BrBundle/Component/Document/Generator/Pdf/Letter.php b/module/BrBundle/Component/Document/Generator/Pdf/Letter.php
index 3009c10307..4400c8c125 100644
--- a/module/BrBundle/Component/Document/Generator/Pdf/Letter.php
+++ b/module/BrBundle/Component/Document/Generator/Pdf/Letter.php
@@ -33,15 +33,21 @@ class Letter extends \CommonBundle\Component\Document\Generator\Pdf
      */
     private $contract;
 
-    public function __construct(EntityManager $entityManager, ContractEntity $contract)
+    /**
+     * @param EntityManager  $entityManager The EntityManager instance
+     * @param ContractEntity $contract      The contract for which we want to generate a PDF
+     * @param TmpFile        $file          The file to write to
+     */
+    public function __construct(EntityManager $entityManager, ContractEntity $contract, TmpFile $file)
     {
+        $filePath = $entityManager
+            ->getRepository('CommonBundle\Entity\General\Config')
+            ->getConfigValue('br.pdf_generator_path');
+
         parent::__construct(
             $entityManager,
-            $entityManager->getRepository('CommonBUndle\Entity\General\Config')
-                ->getConfigValue('br.pdf_generator_path') . '/contract/letter.xsl',
-            $entityManager->getRepository('CommonBUndle\Entity\General\Config')
-                ->getConfigValue('br.file_path') . '/contracts/'
-                . $contract->getId() . '/letter.pdf'
+            $filePath . '/contract/letter.xsl',
+            $file->getFilename()
         );
 
         $this->contract = $contract;
diff --git a/module/BrBundle/Controller/Admin/Company/EventController.php b/module/BrBundle/Controller/Admin/Company/EventController.php
index 774e6107b5..cfc02a8920 100644
--- a/module/BrBundle/Controller/Admin/Company/EventController.php
+++ b/module/BrBundle/Controller/Admin/Company/EventController.php
@@ -194,23 +194,29 @@ public function editPosterAction()
 
     private function receive($file, Event $event)
     {
-        $filePath = $this->getEntityManager()
-            ->getRepository('CommonBundle\Entity\General\Config')
-            ->getConfigValue('calendar.poster_path');
-
-        $image = new Imagick($file['tmp_name']);
-
-        if ($event->getEvent()->getPoster() != '' || $event->getEvent()->getPoster() !== null) {
-            $fileName = '/' . $event->getEvent()->getPoster();
-        } else {
-            do {
-                $fileName = '/' . sha1(uniqid());
-            } while (file_exists($filePath . $fileName));
+        if ($event->getPoster() !== null) {
+            $path = $this->getPath(
+                'calendar_events_posters',
+                $event->getPoster()
+            );
+
+            if ($this->getFilesystem()->has($path)) {
+                $this->getFilesystem()->delete($path);
+            }
         }
 
-        $image->writeImage($filePath . $fileName);
+        do {
+            $poster = sha1(uniqid());
+            $path = $this->getStoragePath('calendar_events_posters', $poster);
+        } while ($this->getFilesystem()->has($path));
+
+        $stream = fopen($file['tmp_name'], 'r+');
+        $this->getFilesystem()->writeStream($path, $stream);
+        if (is_resource($stream)) {
+            fclose($stream);
+        }
 
-        $event->getEvent()->setPoster($fileName);
+        $event->setPoster($poster);
     }
 
     public function uploadAction()
diff --git a/module/BrBundle/Controller/Admin/Company/LogoController.php b/module/BrBundle/Controller/Admin/Company/LogoController.php
index 0a69d8e57e..ac7709b809 100644
--- a/module/BrBundle/Controller/Admin/Company/LogoController.php
+++ b/module/BrBundle/Controller/Admin/Company/LogoController.php
@@ -22,6 +22,7 @@
 
 use BrBundle\Entity\Company;
 use BrBundle\Entity\Company\Logo;
+use CommonBundle\Component\Util\File\TmpFile;
 use Imagick;
 use Zend\View\Model\ViewModel;
 
@@ -63,10 +64,6 @@ public function manageAction()
 
     private function receive($file, Logo $logo)
     {
-        $filePath = 'public/' . $this->getEntityManager()
-            ->getRepository('CommonBundle\Entity\General\Config')
-            ->getConfigValue('br.public_logo_path') . '/';
-
         $image = new Imagick($file['tmp_name']);
         $image->setImageFormat('png');
         $image->scaleImage(1000, 100, true);
@@ -97,15 +94,24 @@ private function receive($file, Logo $logo)
         $all->addImage($original);
         $all->addImage($image);
         $all->resetIterator();
+
+        $tmpFile = new TmpFile();
         $combined = $all->appendImages(true);
         $combined->setImageFormat('png');
+        $combined->writeImage($tmpFile->getFilename());
 
         do {
-            $fileName = sha1(uniqid());
-        } while (file_exists($filePath . $fileName));
-        $combined->writeImage($filePath . $fileName);
+            $image = sha1(uniqid());
+            $path = $this->getStoragePath('br_companies_logos', $image);
+        } while ($this->getFilesystem()->has($path));
+
+        $stream = fopen($tmpFile->getFilename(), 'r+');
+        $this->getFilesystem()->writeStream($path, $stream);
+        if (is_resource($stream)) {
+            fclose($stream);
+        }
 
-        $logo->setPath($fileName)
+        $logo->setImage($image)
             ->setWidth($image->getImageWidth())
             ->setHeight($image->getImageHeight());
     }
@@ -136,7 +142,6 @@ public function addAction()
                 $this->receive($formData['logo'], $logo);
 
                 $this->getEntityManager()->persist($logo);
-
                 $this->getEntityManager()->flush();
 
                 $this->flashMessenger()->success(
@@ -173,12 +178,13 @@ public function deleteAction()
             return new ViewModel();
         }
 
-        $filePath = 'public/' . $this->getEntityManager()
-            ->getRepository('CommonBundle\Entity\General\Config')
-            ->getConfigValue('br.public_logo_path') . '/';
+        $path = $this->getPath(
+            'br_companies_logos',
+            $logo->getImage()
+        );
 
-        if (file_exists($filePath . $logo->getPath())) {
-            unlink($filePath . $logo->getPath());
+        if ($this->getFilesystem()->has($path)) {
+            $this->getFilesystem()->delete($path);
         }
 
         $this->getEntityManager()->remove($logo);
diff --git a/module/BrBundle/Controller/Admin/CompanyController.php b/module/BrBundle/Controller/Admin/CompanyController.php
index 79ca17adc2..063e5fe09f 100644
--- a/module/BrBundle/Controller/Admin/CompanyController.php
+++ b/module/BrBundle/Controller/Admin/CompanyController.php
@@ -173,55 +173,6 @@ public function deleteAction()
         );
     }
 
-    public function uploadAction()
-    {
-        if ($this->getRequest()->isPost()) {
-            $form = $this->getRequest()->getPost();
-
-            $validatorChain = new ValidatorChain();
-            $validatorChain->attach(new UploadFileValidator());
-            if ($form['type'] == 'image') {
-                $validatorChain->attach(
-                    new IsImageValidator(
-                        array('image/gif', 'image/jpeg', 'image/png')
-                    )
-                );
-            }
-
-            $file = $this->getRequest()->getFiles()['file'];
-            if ($validatorChain->isValid($file)) {
-                $filePath = $this->getEntityManager()
-                    ->getRepository('CommonBundle\Entity\General\Config')
-                    ->getConfigValue('br.file_path') . '/';
-
-                do {
-                    $fileName = sha1(uniqid());
-                } while (file_exists($filePath . $fileName));
-
-                $renameUploadFilter = new RenameUploadFilter();
-                $renameUploadFilter->setTarget($filePath . $fileName)
-                    ->filter($file);
-
-                $url = $this->url()->fromRoute(
-                    'br_career_file',
-                    array(
-                        'name' => $fileName,
-                    )
-                );
-
-                return new ViewModel(
-                    array(
-                        'result' => array(
-                            'name' => $url,
-                        ),
-                    )
-                );
-            }
-        }
-
-        return new ViewModel();
-    }
-
     public function editLogoAction()
     {
         $company = $this->getCompanyEntity();
@@ -231,10 +182,6 @@ public function editLogoAction()
 
         $form = $this->getForm('br_company_logo');
 
-        $filePath = $this->getEntityManager()
-            ->getRepository('CommonBundle\Entity\General\Config')
-            ->getConfigValue('br.public_logo_path');
-
         if ($this->getRequest()->isPost()) {
             $form->setData(
                 array_merge_recursive(
@@ -245,18 +192,35 @@ public function editLogoAction()
 
             if ($form->isValid()) {
                 $formData = $form->getData();
+
+                $tmpFile = new TmpFile();
                 $image = new Imagick($formData['logo']['tmp_name']);
                 $image->thumbnailImage(320, 320, true);
+                $image->writeImage($tmpFile->getFilename());
+
+                if ($company->getLogo() !== null) {
+                    $path = $this->getPath(
+                        'br_companies_logos',
+                        $company->getLogo()
+                    );
+
+                    if ($this->getFilesystem()->has($path)) {
+                        $this->getFilesystem()->delete($path);
+                    }
+                }
 
-                if ($company->getLogo() != '' || $company->getLogo() !== null) {
-                    $fileName = '/' . $company->getLogo();
-                } else {
-                    do {
-                        $fileName = '/' . sha1(uniqid());
-                    } while (file_exists($filePath . $fileName));
+                do {
+                    $logo = sha1(uniqid());
+                    $path = $this->getStoragePath('br_companies_logos', $logo);
+                } while ($this->getFilesystem()->has($path));
+
+                $stream = fopen($tmpFile->getFilename(), 'r+');
+                $this->getFilesystem()->writeStream($path, $stream);
+                if (is_resource($stream)) {
+                    fclose($stream);
                 }
-                $image->writeImage('public/' . $filePath . $fileName);
-                $company->setLogo($fileName);
+
+                $company->setLogo($logo);
 
                 $this->getEntityManager()->flush();
 
@@ -279,9 +243,8 @@ public function editLogoAction()
 
         return new ViewModel(
             array(
-                'company'  => $company,
-                'form'     => $form,
-                'logoPath' => $filePath,
+                'company' => $company,
+                'form'    => $form,
             )
         );
     }
diff --git a/module/BrBundle/Controller/Admin/ContractController.php b/module/BrBundle/Controller/Admin/ContractController.php
index dd52fc04dd..0c42f2af71 100644
--- a/module/BrBundle/Controller/Admin/ContractController.php
+++ b/module/BrBundle/Controller/Admin/ContractController.php
@@ -27,6 +27,7 @@
 use BrBundle\Entity\Invoice\Entry as InvoiceEntry;
 use CommonBundle\Component\Document\Generator\Csv as CsvGenerator;
 use CommonBundle\Component\Util\File as FileUtil;
+use CommonBundle\Component\Util\File\TmpFile;
 use CommonBundle\Component\Util\File\TmpFile\Csv as CsvFile;
 use Zend\Http\Headers;
 use Zend\View\Model\ViewModel;
@@ -328,18 +329,10 @@ public function downloadAction()
             return new ViewModel();
         }
 
-        $generator = new ContractGenerator($this->getEntityManager(), $contract, $this->getTranslator()->getTranslator());
+        $file = new TmpFile();
+        $generator = new ContractGenerator($this->getEntityManager(), $contract, $file, $this->getTranslator()->getTranslator());
         $generator->generate();
 
-        $file = FileUtil::getRealFilename(
-            $this->getEntityManager()
-                ->getRepository('CommonBundle\Entity\General\Config')
-                ->getConfigValue('br.file_path') . '/contracts/'
-                . $this->getParam('id') . '/contract.pdf'
-        );
-        $fileHandler = fopen($file, 'r');
-        $content = fread($fileHandler, filesize($file));
-
         $contractNb = $contract->getFullContractNumber($this->getEntityManager());
         $companyName = $contract->getCompany()->getName();
 
@@ -354,7 +347,7 @@ public function downloadAction()
 
         return new ViewModel(
             array(
-                'data' => $content,
+                'data' => $file->getContent(),
             )
         );
     }
diff --git a/module/BrBundle/Controller/Admin/CvController.php b/module/BrBundle/Controller/Admin/CvController.php
index 36ae6dd687..8d47d2a3aa 100644
--- a/module/BrBundle/Controller/Admin/CvController.php
+++ b/module/BrBundle/Controller/Admin/CvController.php
@@ -20,11 +20,11 @@
 
 namespace BrBundle\Controller\Admin;
 
-use BrBundle\Component\Document\Generator\Pdf\CvBook as CvBookGenerator;
+use BrBundle\Component\Document\Generator\Pdf\Cv\Book as CvBookGenerator;
 use BrBundle\Entity\Cv\Entry;
 use CommonBundle\Component\Document\Generator\Csv as CsvGenerator;
 use CommonBundle\Component\Util\File\TmpFile;
-use CommonBundle\Component\Util\File\TmpFile\Csv as CsvFile;
+use CommonBundle\Component\Util\File\TmpFile\Csv as TmpCsvFile;
 use Zend\Http\Headers;
 use Zend\View\Model\ViewModel;
 
@@ -97,7 +97,7 @@ public function exportAcademicsAction()
             ->getRepository('BrBundle\Entity\Cv\Entry')
             ->findAllByAcademicYear($this->getAcademicYear());
 
-        $file = new CsvFile();
+        $file = new TmpCsvFile();
         $heading = array('First Name', 'Last Name', 'Email', 'Address', 'Phone', 'Study');
 
         $results = array();
diff --git a/module/BrBundle/Controller/Admin/InvoiceController.php b/module/BrBundle/Controller/Admin/InvoiceController.php
index bfd841f247..eab7736830 100644
--- a/module/BrBundle/Controller/Admin/InvoiceController.php
+++ b/module/BrBundle/Controller/Admin/InvoiceController.php
@@ -224,14 +224,16 @@ public function manualAddAction()
         $form = $this->getForm('br_invoice_manual-add');
 
         if ($this->getRequest()->isPost()) {
-            $formData = array_merge(
-                $this->getRequest()->getPost()->toArray(),
-                $this->getRequest()->getFiles()->toArray()
+            $form->setData(
+                array_merge_recursive(
+                    $this->getRequest()->getPost()->toArray(),
+                    $this->getRequest()->getFiles()->toArray()
+                )
             );
 
-            $form->setData($formData);
-
             if ($form->isValid()) {
+                $formData = $form->getData();
+
                 $invoice = $form->hydrateObject(
                     new ManualInvoice(
                         $this->getEntityManager(),
@@ -239,23 +241,18 @@ public function manualAddAction()
                     )
                 );
 
-                $filePath = $this->getEntityManager()
-                    ->getRepository('CommonBundle\Entity\General\Config')
-                    ->getConfigValue('br.file_path')
-                        . '/invoices/'
-                        . $invoice->getInvoiceNumberPrefix();
-
-                if (!file_exists($filePath)) {
-                    if (!mkdir($filePath, 0770, true)) {
-                        throw new RuntimeException('Failed to create the PDF directory');
-                    }
-                }
-
                 do {
-                    $fileName = '/' . $invoice->getInvoiceNumber() . '.pdf';
-                } while (file_exists($filePath . $fileName));
+                    $file = sha1(uniqid());
+                    $path = $this->getStoragePath('br_invoices_manual', $file);
+                } while ($this->getFilesystem()->has($path));
+
+                $stream = fopen($formData['file']['tmp_name'], 'r+');
+                $this->getFilesystem()->writeStream($path, $stream);
+                if (is_resource($stream)) {
+                    fclose($stream);
+                }
 
-                rename($formData['file']['tmp_name'], $filePath . $fileName);
+                $invoice->setFile($file);
 
                 $this->getEntityManager()->persist($invoice);
                 $this->getEntityManager()->flush();
@@ -291,36 +288,51 @@ public function editAction()
         }
 
         if ($invoice->hasContract()) {
-            $form = $this->getForm('br_invoice_contract-edit', array('invoice' => $invoice));
+            $form = $this->getForm(
+                'br_invoice_contract-edit',
+                array(
+                    'invoice' => $invoice,
+                )
+            );
         } else {
-            $form = $this->getForm('br_invoice_manual-edit', array('invoice' => $invoice));
+            $form = $this->getForm(
+                'br_invoice_manual-edit',
+                array(
+                    'invoice' => $invoice,
+                )
+            );
         }
 
         if ($this->getRequest()->isPost()) {
-            $formData = array_merge(
-                $this->getRequest()->getPost()->toArray(),
-                $this->getRequest()->getFiles()->toArray()
+            $form->setData(
+                array_merge_recursive(
+                    $this->getRequest()->getPost()->toArray(),
+                    $this->getRequest()->getFiles()->toArray()
+                )
             );
 
-            $form->setData($formData);
-
             if ($form->isValid()) {
-                if (isset($formData['file']) && !($formData['file']['tmp_name'] == '')) {
-                    $filePath = $this->getEntityManager()
-                        ->getRepository('CommonBundle\Entity\General\Config')
-                        ->getConfigValue('br.file_path') . '/invoices/'
-                    . $invoice->getInvoiceNumberPrefix();
+                $formData = $form->getData();
 
+                $this->getEntityManager()->persist(
+                    new History($invoice)
+                );
+
+                if (isset($formData['file']) && $formData['file']['tmp_name'] != '') {
                     do {
-                        $fileName = '/' . $invoice->getInvoiceNumber() . '.pdf';
-                    } while (file_exists($filePath . $fileName));
+                        $file = sha1(uniqid());
+                        $path = $this->getStoragePath('br_invoices_manual', $file);
+                    } while ($this->getFilesystem()->has($path));
+
+                    $stream = fopen($formData['file']['tmp_name'], 'r+');
+                    $this->getFilesystem()->writeStream($path, $stream);
+                    if (is_resource($stream)) {
+                        fclose($stream);
+                    }
 
-                    rename($formData['file']['tmp_name'], $filePath . $fileName);
+                    $invoice->setFile($file);
                 }
 
-                $history = new History($invoice);
-                $this->getEntityManager()->persist($history);
-
                 $this->getEntityManager()->flush();
 
                 $this->flashMessenger()->success(
@@ -353,22 +365,13 @@ public function downloadAction()
             return new ViewModel();
         }
 
-        $language = $this->getParam('language');
-        if ($invoice->hasContract()) {
-            $generator = new InvoiceGenerator($this->getEntityManager(), $invoice, $language);
-            $generator->generate();
+        if (!$invoice->hasContract()) {
+            return new ViewModel();
         }
 
-        $file = FileUtil::getRealFilename(
-            $this->getEntityManager()
-                ->getRepository('CommonBundle\Entity\General\Config')
-                ->getConfigValue('br.file_path') . '/invoices/'
-                . $invoice->getInvoiceNumberPrefix() . '/'
-                . $invoice->getInvoiceNumber() . '.pdf'
-        );
-
-        $fileHandler = fopen($file, 'r');
-        $content = fread($fileHandler, filesize($file));
+        $file = new TmpFile();
+        $generator = new InvoiceGenerator($this->getEntityManager(), $invoice, $file, $this->getParam('language'));
+        $generator->generate();
 
         $invoiceNb = $invoice->getInvoiceNumber();
         $companyName = $invoice->getCompany()->getName();
@@ -384,7 +387,7 @@ public function downloadAction()
 
         return new ViewModel(
             array(
-                'data' => $content,
+                'data' => $file->getContent(),
             )
         );
     }
@@ -487,25 +490,11 @@ private function getInvoiceEntity($allowPaid = true)
      */
     private function getCollaboratorEntity()
     {
-        if (!$this->getAuthentication()->isAuthenticated()) {
-            $this->flashMessenger()->error(
-                'Error',
-                'You are not a collaborator, so you cannot add or edit invoices.'
-            );
-
-            $this->redirect()->toRoute(
-                'br_admin_invoice',
-                array(
-                    'action' => 'manage',
-                )
-            );
-
-            return;
-        }
-
         $collaborator = $this->getEntityManager()
             ->getRepository('BrBundle\Entity\Collaborator')
-            ->findCollaboratorByPersonId($this->getAuthentication()->getPersonObject()->getId());
+            ->findCollaboratorByPersonId(
+                $this->getAuthentication()->getPersonObject()->getId()
+            );
 
         if ($collaborator === null) {
             $this->flashMessenger()->error(
diff --git a/module/BrBundle/Controller/Career/CompanyController.php b/module/BrBundle/Controller/Career/CompanyController.php
index a3a666d878..2a5307db58 100644
--- a/module/BrBundle/Controller/Career/CompanyController.php
+++ b/module/BrBundle/Controller/Career/CompanyController.php
@@ -35,13 +35,8 @@ class CompanyController extends \BrBundle\Component\Controller\CareerController
 {
     public function overviewAction()
     {
-        $logoPath = $this->getEntityManager()
-            ->getRepository('CommonBundle\Entity\General\Config')
-            ->getConfigValue('br.public_logo_path');
-
         return new ViewModel(
             array(
-                'logoPath'         => $logoPath,
                 'possible_sectors' => array('all' => 'All') + Company::POSSIBLE_SECTORS,
             )
         );
@@ -54,10 +49,6 @@ public function viewAction()
             return new ViewModel();
         }
 
-        $logoPath = $this->getEntityManager()
-            ->getRepository('CommonBundle\Entity\General\Config')
-            ->getConfigValue('br.public_logo_path');
-
         $events = $this->getEntityManager()
             ->getRepository('BrBundle\Entity\Company\Event')
             ->findAllFutureByCompany(new DateTime(), $page->getCompany());
@@ -72,7 +63,6 @@ public function viewAction()
 
         return new ViewModel(
             array(
-                'logoPath'    => $logoPath,
                 'page'        => $page,
                 'events'      => $events,
                 'internships' => $internships,
@@ -81,37 +71,6 @@ public function viewAction()
         );
     }
 
-    public function fileAction()
-    {
-        $filePath = $this->getEntityManager()
-            ->getRepository('CommonBundle\Entity\General\Config')
-            ->getConfigValue('br.file_path') . '/' . $this->getParam('name');
-
-        if ($this->getParam('name') == '' || !file_exists($filePath)) {
-            return $this->notFoundAction();
-        }
-
-        $headers = new Headers();
-        $headers->addHeaders(
-            array(
-                'Content-Disposition' => 'inline; filename="' . $this->getParam('name') . '"',
-                'Content-Type'        => mime_content_type($filePath),
-                'Content-Length'      => filesize($filePath),
-            )
-        );
-        $this->getResponse()->setHeaders($headers);
-
-        $handle = fopen($filePath, 'r');
-        $data = fread($handle, filesize($filePath));
-        fclose($handle);
-
-        return new ViewModel(
-            array(
-                'data' => $data,
-            )
-        );
-    }
-
     public function searchAction()
     {
         $this->initAjax();
diff --git a/module/BrBundle/Controller/Career/EventController.php b/module/BrBundle/Controller/Career/EventController.php
index 086e5239f3..07df45c158 100644
--- a/module/BrBundle/Controller/Career/EventController.php
+++ b/module/BrBundle/Controller/Career/EventController.php
@@ -77,14 +77,9 @@ public function viewAction()
             return new ViewModel();
         }
 
-        $logoPath = $this->getEntityManager()
-            ->getRepository('CommonBundle\Entity\General\Config')
-            ->getConfigValue('br.public_logo_path');
-
         return new ViewModel(
             array(
-                'event'    => $event,
-                'logoPath' => $logoPath,
+                'event' => $event,
             )
         );
     }
diff --git a/module/BrBundle/Controller/Career/InternshipController.php b/module/BrBundle/Controller/Career/InternshipController.php
index 4c6c6570e7..a8d2159aa2 100644
--- a/module/BrBundle/Controller/Career/InternshipController.php
+++ b/module/BrBundle/Controller/Career/InternshipController.php
@@ -67,15 +67,10 @@ public function overviewAction()
             $this->getParam('page')
         );
 
-        $logoPath = $this->getEntityManager()
-            ->getRepository('CommonBundle\Entity\General\Config')
-            ->getConfigValue('br.public_logo_path');
-
         return new ViewModel(
             array(
                 'paginator'            => $paginator,
                 'paginationControl'    => $this->paginator()->createControl(true),
-                'logoPath'             => $logoPath,
                 'internshipSearchForm' => $internshipSearchForm,
             )
         );
@@ -88,14 +83,9 @@ public function viewAction()
             return new ViewModel();
         }
 
-        $logoPath = $this->getEntityManager()
-            ->getRepository('CommonBundle\Entity\General\Config')
-            ->getConfigValue('br.public_logo_path');
-
         return new ViewModel(
             array(
                 'internship' => $internship,
-                'logoPath'   => $logoPath,
             )
         );
     }
diff --git a/module/BrBundle/Controller/Career/VacancyController.php b/module/BrBundle/Controller/Career/VacancyController.php
index 08abeee6ba..3b5f7071f4 100644
--- a/module/BrBundle/Controller/Career/VacancyController.php
+++ b/module/BrBundle/Controller/Career/VacancyController.php
@@ -67,15 +67,10 @@ public function overviewAction()
             $this->getParam('page')
         );
 
-        $logoPath = $this->getEntityManager()
-            ->getRepository('CommonBundle\Entity\General\Config')
-            ->getConfigValue('br.public_logo_path');
-
         return new ViewModel(
             array(
                 'paginator'         => $paginator,
                 'paginationControl' => $this->paginator()->createControl(true),
-                'logoPath'          => $logoPath,
                 'vacancySearchForm' => $vacancySearchForm,
             )
         );
@@ -88,14 +83,9 @@ public function viewAction()
             return new ViewModel();
         }
 
-        $logoPath = $this->getEntityManager()
-            ->getRepository('CommonBundle\Entity\General\Config')
-            ->getConfigValue('br.public_logo_path');
-
         return new ViewModel(
             array(
                 'vacancy'  => $vacancy,
-                'logoPath' => $logoPath,
             )
         );
     }
diff --git a/module/BrBundle/Controller/Company/LogoController.php b/module/BrBundle/Controller/Company/LogoController.php
new file mode 100644
index 0000000000..4f33865b76
--- /dev/null
+++ b/module/BrBundle/Controller/Company/LogoController.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Litus is a project by a group of students from the KU Leuven. The goal is to create
+ * various applications to support the IT needs of student unions.
+ *
+ * @author Niels Avonds <niels.avonds@litus.cc>
+ * @author Karsten Daemen <karsten.daemen@litus.cc>
+ * @author Koen Certyn <koen.certyn@litus.cc>
+ * @author Bram Gotink <bram.gotink@litus.cc>
+ * @author Dario Incalza <dario.incalza@litus.cc>
+ * @author Pieter Maene <pieter.maene@litus.cc>
+ * @author Kristof Mariën <kristof.marien@litus.cc>
+ * @author Lars Vierbergen <lars.vierbergen@litus.cc>
+ * @author Daan Wendelen <daan.wendelen@litus.cc>
+ * @author Mathijs Cuppens <mathijs.cuppens@litus.cc>
+ * @author Floris Kint <floris.kint@vtk.be>
+ *
+ * @license http://litus.cc/LICENSE
+ */
+
+namespace BrBundle\Controller\Company;
+
+use Zend\Http\Headers;
+use Zend\View\Model\ViewModel;
+
+/**
+ * LogoController
+ *
+ * @author Pieter Maene <pieter.maene@litus.cc>
+ */
+class LogoController extends \CommonBundle\Component\Controller\ActionController\AdminController
+{
+    public function viewAction()
+    {
+        $path = $this->getStoragePath(
+            'br_companies_logos',
+            $this->getParam('image')
+        );
+
+        if (!$this->getFilesystem()->has($path)) {
+            return $this->notFoundAction();
+        }
+
+        $headers = new Headers();
+        $headers->addHeaders(
+            array(
+                'Content-Disposition' => 'inline; filename="' . $this->getParam('image') . '"',
+                'Content-Type'        => $this->getFilesystem()->getMimetype($path),
+                'Content-Length'      => $this->getFilesystem()->getSize($path),
+            )
+        );
+        $this->getResponse()->setHeaders($headers);
+
+        return new ViewModel(
+            array(
+                'data' => $this->getFilesystem()->read($path),
+            )
+        );
+    }
+}
diff --git a/module/BrBundle/Controller/CompanyController.php b/module/BrBundle/Controller/CompanyController.php
new file mode 100644
index 0000000000..4146f296bd
--- /dev/null
+++ b/module/BrBundle/Controller/CompanyController.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Litus is a project by a group of students from the KU Leuven. The goal is to create
+ * various applications to support the IT needs of student unions.
+ *
+ * @author Niels Avonds <niels.avonds@litus.cc>
+ * @author Karsten Daemen <karsten.daemen@litus.cc>
+ * @author Koen Certyn <koen.certyn@litus.cc>
+ * @author Bram Gotink <bram.gotink@litus.cc>
+ * @author Dario Incalza <dario.incalza@litus.cc>
+ * @author Pieter Maene <pieter.maene@litus.cc>
+ * @author Kristof Mariën <kristof.marien@litus.cc>
+ * @author Lars Vierbergen <lars.vierbergen@litus.cc>
+ * @author Daan Wendelen <daan.wendelen@litus.cc>
+ * @author Mathijs Cuppens <mathijs.cuppens@litus.cc>
+ * @author Floris Kint <floris.kint@vtk.be>
+ *
+ * @license http://litus.cc/LICENSE
+ */
+
+namespace BrBundle\Controller;
+
+use Zend\Http\Headers;
+use Zend\View\Model\ViewModel;
+
+/**
+ * CompanyController
+ *
+ * @author Pieter Maene <pieter.maene@litus.cc>
+ */
+class CompanyController extends \CommonBundle\Component\Controller\ActionController\AdminController
+{
+    public function logoAction()
+    {
+        $path = $this->getStoragePath(
+            'br_companies_logos',
+            $this->getParam('image')
+        );
+
+        if (!$this->getFilesystem()->has($path)) {
+            return $this->notFoundAction();
+        }
+
+        $headers = new Headers();
+        $headers->addHeaders(
+            array(
+                'Content-Disposition' => 'inline; filename="' . $this->getParam('image') . '"',
+                'Content-Type'        => $this->getFilesystem()->getMimetype($path),
+                'Content-Length'      => $this->getFilesystem()->getSize($path),
+            )
+        );
+        $this->getResponse()->setHeaders($headers);
+
+        return new ViewModel(
+            array(
+                'data' => $this->getFilesystem()->read($path),
+            )
+        );
+    }
+}
diff --git a/module/BrBundle/Controller/Corporate/CvController.php b/module/BrBundle/Controller/Corporate/CvController.php
index 5d69551ec3..95ab73f4e6 100644
--- a/module/BrBundle/Controller/Corporate/CvController.php
+++ b/module/BrBundle/Controller/Corporate/CvController.php
@@ -215,22 +215,19 @@ public function downloadArchiveAction()
             return new ViewModel();
         }
 
-        $archive = unserialize(
+        $archiveYears = unserialize(
             $this->getEntityManager()
                 ->getRepository('CommonBundle\Entity\General\Config')
                 ->getConfigValue('br.cv_archive_years')
         );
 
-        $filePath = $this->getEntityManager()
-            ->getRepository('CommonBundle\Entity\General\Config')
-            ->getConfigValue('br.file_path') . '/cv/';
-
         $archiveYearKey = '';
         $archiveYear = null;
-        foreach ($archive as $key => $year) {
-            if ($year['full_year'] == $this->getParam('academicyear')) {
-                $archiveYear = $year;
+        foreach ($archiveYears as $key => $value) {
+            if ($value['full_year'] == $this->getParam('academicyear')) {
                 $archiveYearKey = $key;
+                $archiveYear = $year;
+
                 break;
             }
         }
@@ -251,23 +248,28 @@ public function downloadArchiveAction()
             return new ViewModel();
         }
 
+        $path = $this->getStoragePath(
+            'br_cv_books',
+            $archiveYear['file']
+        );
+
+        if (!$this->getFilesystem()->has($path)) {
+            return $this->notFoundAction();
+        }
+
         $headers = new Headers();
         $headers->addHeaders(
             array(
-                'Content-Disposition' => 'inline; filename="cv-' . $archiveYear['full_year'] . '.pdf"',
-                'Content-Type'        => 'application/octet-stream',
-                'Content-Length'      => filesize($filePath . $archiveYear['file']),
+                'Content-Disposition' => 'inline; filename="cv_book_' . $this->getParam('academicyear') . '.pdf"',
+                'Content-Type'        => $this->getFilesystem()->getMimetype($path),
+                'Content-Length'      => $this->getFilesystem()->getSize($path),
             )
         );
         $this->getResponse()->setHeaders($headers);
 
-        $handle = fopen($filePath . $archiveYear['file'], 'r');
-        $data = fread($handle, filesize($filePath . $archiveYear['file']));
-        fclose($handle);
-
         return new ViewModel(
             array(
-                'data' => $data,
+                'data' => $this->getFilesystem()->read($path),
             )
         );
     }
diff --git a/module/BrBundle/Controller/Corporate/InternshipController.php b/module/BrBundle/Controller/Corporate/InternshipController.php
index cefd1b794a..139f5ac518 100644
--- a/module/BrBundle/Controller/Corporate/InternshipController.php
+++ b/module/BrBundle/Controller/Corporate/InternshipController.php
@@ -46,10 +46,6 @@ public function overviewAction()
             $this->getParam('page')
         );
 
-        $logoPath = $this->getEntityManager()
-            ->getRepository('CommonBundle\Entity\General\Config')
-            ->getConfigValue('br.public_logo_path');
-
         $requests = $this->getOpenRequests($person->getCompany());
 
         $unfinishedRequestsJobs = array();
@@ -65,7 +61,6 @@ public function overviewAction()
             array(
                 'paginator'          => $paginator,
                 'paginationControl'  => $this->paginator()->createControl(true),
-                'logoPath'           => $logoPath,
                 'requests'           => $requests,
                 'unfinishedRequests' => $unfinishedRequestsJobs,
             )
diff --git a/module/BrBundle/Controller/Corporate/VacancyController.php b/module/BrBundle/Controller/Corporate/VacancyController.php
index a9193046be..88e72f9ee9 100644
--- a/module/BrBundle/Controller/Corporate/VacancyController.php
+++ b/module/BrBundle/Controller/Corporate/VacancyController.php
@@ -47,10 +47,6 @@ public function overviewAction()
             $this->getParam('page')
         );
 
-        $logoPath = $this->getEntityManager()
-            ->getRepository('CommonBundle\Entity\General\Config')
-            ->getConfigValue('br.public_logo_path');
-
         $requests = $this->getOpenRequests($person->getCompany());
 
         $unfinishedRequestsJobs = array();
@@ -66,7 +62,6 @@ public function overviewAction()
             array(
                 'paginator'          => $paginator,
                 'paginationControl'  => $this->paginator()->createControl(true),
-                'logoPath'           => $logoPath,
                 'requests'           => $requests,
                 'unfinishedRequests' => $unfinishedRequestsJobs,
             )
diff --git a/module/BrBundle/Controller/CvController.php b/module/BrBundle/Controller/CvController.php
index 83d528270a..1a54aaa0de 100644
--- a/module/BrBundle/Controller/CvController.php
+++ b/module/BrBundle/Controller/CvController.php
@@ -20,7 +20,7 @@
 
 namespace BrBundle\Controller;
 
-use BrBundle\Component\Document\Generator\Pdf\Cv as CvGenerator;
+use BrBundle\Component\Document\Generator\Pdf\Cv\Single as SingleCvGenerator;
 use BrBundle\Entity\Cv\Entry as CvEntry;
 use CommonBundle\Component\FlashMessenger\FlashMessage;
 use CommonBundle\Component\Util\File\TmpFile;
@@ -309,7 +309,7 @@ public function downloadAction()
         $file = new TmpFile();
 
         $translator = $this->getTranslator();
-        $document = new CvGenerator($this->getEntityManager(), $entry, $file, $translator);
+        $document = new SingleCvGenerator($this->getEntityManager(), $entry, $file, $translator);
 
         $document->generate();
 
diff --git a/module/BrBundle/Entity/Company/Logo.php b/module/BrBundle/Entity/Company/Logo.php
index 584df10d9f..ea7fabc5c2 100644
--- a/module/BrBundle/Entity/Company/Logo.php
+++ b/module/BrBundle/Entity/Company/Logo.php
@@ -56,11 +56,11 @@ class Logo
     private $url;
 
     /**
-     * @var string The path to the logo
+     * @var string The name of the image
      *
      * @ORM\Column(type="string")
      */
-    private $path;
+    private $image;
 
     /**
      * @var Company The company of the logo
@@ -174,18 +174,18 @@ public function setUrl($url)
     /**
      * @return string
      */
-    public function getPath()
+    public function getImage()
     {
-        return $this->path;
+        return $this->image;
     }
 
     /**
-     * @param  string $path
+     * @param  string $image
      * @return self
      */
-    public function setPath($path)
+    public function setImage($image)
     {
-        $this->path = $path;
+        $this->image = $image;
 
         return $this;
     }
diff --git a/module/BrBundle/Entity/Invoice/History.php b/module/BrBundle/Entity/Invoice/History.php
index 0fcb02df32..0270e40f1e 100644
--- a/module/BrBundle/Entity/Invoice/History.php
+++ b/module/BrBundle/Entity/Invoice/History.php
@@ -47,6 +47,13 @@ class History
      */
     private $invoice;
 
+    /**
+     * @var integer The version of the invoice this entry belongs to
+     *
+     * @ORM\Column(type="integer")
+     */
+    private $version;
+
     /**
      * @var ArrayCollection The oldest version of the two
      *
@@ -56,11 +63,11 @@ class History
     private $entries;
 
     /**
-     * @var integer The version of the invoice this entry belongs too.
+     * @var string The name of the file
      *
-     * @ORM\Column(type="integer")
+     * @ORM\Column(type="string", nullable=true)
      */
-    private $version;
+    private $file;
 
     /**
      * @param Invoice $invoice
@@ -68,14 +75,18 @@ class History
     public function __construct(Invoice $invoice)
     {
         $this->invoice = $invoice;
+        $this->version = $invoice->getVersion();
 
+        $entries = array();
         if ($invoice->hasContract()) {
-            $this->entries = new ArrayCollection($invoice->getEntries());
-        } else {
-            $this->entries = new ArrayCollection();
+            $entries = $invoice->getEntries();
         }
 
-        $this->version = $invoice->getVersion();
+        $this->entries = new ArrayCollection($entries);
+
+        if ($invoice instanceof Manual) {
+            $this->file = $invoice->getFile();
+        }
     }
 
     /**
@@ -94,6 +105,14 @@ public function getInvoice()
         return $this->invoice;
     }
 
+    /**
+     * @return integer
+     */
+    public function getVersion()
+    {
+        return $this->version;
+    }
+
     /**
      * @return ArrayCollection
      */
@@ -103,10 +122,10 @@ public function getEntries()
     }
 
     /**
-     * @return integer
+     * @return string
      */
-    public function getVersion()
+    public function getFile()
     {
-        return $this->version;
+        return $this->file;
     }
 }
diff --git a/module/BrBundle/Entity/Invoice/Manual.php b/module/BrBundle/Entity/Invoice/Manual.php
index f33b5160d0..f0466bf9f4 100644
--- a/module/BrBundle/Entity/Invoice/Manual.php
+++ b/module/BrBundle/Entity/Invoice/Manual.php
@@ -77,6 +77,13 @@ class Manual extends \BrBundle\Entity\Invoice
      */
     private $refund;
 
+    /**
+     * @var string The name of the file
+     *
+     * @ORM\Column(type="string", options={"default" = ""})
+     */
+    private $file;
+
     public function __construct(EntityManager $entityManager, Collaborator $person)
     {
         parent::__construct($entityManager);
@@ -231,9 +238,9 @@ public function getTitle()
     }
 
     /**
-     * @throws InvalidArgumentException
      * @param  string $title The title of the contract
      * @return self
+     * @throws InvalidArgumentException
      */
     public function setTitle($title)
     {
@@ -246,6 +253,25 @@ public function setTitle($title)
         return $this;
     }
 
+    /**
+     * @return string
+     */
+    public function getFile()
+    {
+        return $this->file;
+    }
+
+    /**
+     * @param  string $file
+     * @return self
+     */
+    public function setFile($file)
+    {
+        $this->file = $file;
+
+        return $this;
+    }
+
     /**
      * @return \DateTime
      */
diff --git a/module/BrBundle/Resources/config/install/acl.config.php b/module/BrBundle/Resources/config/install/acl.config.php
index 36b817d881..9cd141a662 100644
--- a/module/BrBundle/Resources/config/install/acl.config.php
+++ b/module/BrBundle/Resources/config/install/acl.config.php
@@ -90,6 +90,12 @@
         'br_career_internship' => array(
             'view', 'overview',
         ),
+        'br_company' => array(
+            'logo'
+        ),
+        'br_company_logo' => array(
+            'view'
+        ),
         'br_cv_index' => array(
             'cv', 'edit', 'complete', 'delete', 'download', 'uploadProfileImage',
         ),
diff --git a/module/BrBundle/Resources/config/install/roles.config.php b/module/BrBundle/Resources/config/install/roles.config.php
index 4be9aea146..9dd391f89d 100644
--- a/module/BrBundle/Resources/config/install/roles.config.php
+++ b/module/BrBundle/Resources/config/install/roles.config.php
@@ -25,6 +25,12 @@
             'guest',
         ),
         'actions' => array(
+            'br_company' => array(
+                'logo',
+            ),
+            'br_company_logo' => array(
+                'view',
+            ),
         ),
     ),
 );
diff --git a/module/BrBundle/Resources/config/router.config.php b/module/BrBundle/Resources/config/router.config.php
index c6e9780830..af7a8f2415 100644
--- a/module/BrBundle/Resources/config/router.config.php
+++ b/module/BrBundle/Resources/config/router.config.php
@@ -20,17 +20,6 @@
 
 return array(
     'routes' => array(
-        'br_install' => array(
-            'type'    => 'Zend\Router\Http\Segment',
-            'options' => array(
-                'route'    => '/admin/br/install/br[/]',
-                'defaults' => array(
-                    'controller' => 'br_install',
-                    'action'     => 'index',
-                ),
-            ),
-        ),
-
         'br_admin_collaborator' => array(
             'type'    => 'Zend\Router\Http\Segment',
             'options' => array(
@@ -46,7 +35,6 @@
                 ),
             ),
         ),
-
         'br_admin_company' => array(
             'type'    => 'Zend\Router\Http\Segment',
             'options' => array(
@@ -353,19 +341,36 @@
                 ),
             ),
         ),
-        'br_career_file' => array(
+
+        'br_company' => array(
             'type'    => 'Zend\Router\Http\Segment',
             'options' => array(
-                'route'       => '/career/company/file/:name[/]',
+                'route'       => '/br/company[/:action[/image/:image]][/]',
                 'constraints' => array(
-                    'name' => '[a-zA-Z0-9_-]*',
+                    'action' => '[a-zA-Z][a-zA-Z0-9_-]*',
+                    'image'  => '[a-zA-Z0-9]*',
                 ),
                 'defaults' => array(
-                    'controller' => 'br_career_company',
-                    'action'     => 'file',
+                    'controller' => 'br_company',
+                    'action'     => 'view',
                 ),
             ),
         ),
+        'br_company_logo' => array(
+            'type'    => 'Zend\Router\Http\Segment',
+            'options' => array(
+                'route'       => '/br/company/logo[/:action[/image/:image]][/]',
+                'constraints' => array(
+                    'action' => '[a-zA-Z][a-zA-Z0-9_-]*',
+                    'image'  => '[a-zA-Z0-9]*',
+                ),
+                'defaults' => array(
+                    'controller' => 'br_company_logo',
+                    'action'     => 'view',
+                ),
+            ),
+        ),
+
         'br_corporate_index' => array(
             'type'    => 'Zend\Router\Http\Segment',
             'options' => array(
@@ -511,6 +516,9 @@
         'br_admin_overview'     => 'BrBundle\Controller\Admin\OverviewController',
         'br_admin_request'      => 'BrBundle\Controller\Admin\RequestController',
 
+        'br_company'      => 'BrBundle\Controller\CompanyController',
+        'br_company_logo' => 'BrBundle\Controller\Company\LogoController',
+
         'br_corporate_index'      => 'BrBundle\Controller\Corporate\IndexController',
         'br_corporate_cv'         => 'BrBundle\Controller\Corporate\CvController',
         'br_corporate_auth'       => 'BrBundle\Controller\Corporate\AuthController',
diff --git a/module/BrBundle/Resources/config/storage.config.php b/module/BrBundle/Resources/config/storage.config.php
new file mode 100644
index 0000000000..21c5b06bb7
--- /dev/null
+++ b/module/BrBundle/Resources/config/storage.config.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Litus is a project by a group of students from the KU Leuven. The goal is to create
+ * various applications to support the IT needs of student unions.
+ *
+ * @author Niels Avonds <niels.avonds@litus.cc>
+ * @author Karsten Daemen <karsten.daemen@litus.cc>
+ * @author Koen Certyn <koen.certyn@litus.cc>
+ * @author Bram Gotink <bram.gotink@litus.cc>
+ * @author Dario Incalza <dario.incalza@litus.cc>
+ * @author Pieter Maene <pieter.maene@litus.cc>
+ * @author Kristof Mariën <kristof.marien@litus.cc>
+ * @author Lars Vierbergen <lars.vierbergen@litus.cc>
+ * @author Daan Wendelen <daan.wendelen@litus.cc>
+ * @author Mathijs Cuppens <mathijs.cuppens@litus.cc>
+ * @author Floris Kint <floris.kint@vtk.be>
+ *
+ * @license http://litus.cc/LICENSE
+ */
+
+return array(
+    'directories' => array(
+        'br_companies_logos' => 'br/companies_logos',
+        'br_cv_books'        => 'br/cv_books',
+        'br_invoices_manual' => 'br/invoices_manual',
+    ),
+);
diff --git a/module/BrBundle/Resources/views/br/admin/company/edit-logo.twig b/module/BrBundle/Resources/views/br/admin/company/edit-logo.twig
index b0e7936ddb..f9c5339f6c 100644
--- a/module/BrBundle/Resources/views/br/admin/company/edit-logo.twig
+++ b/module/BrBundle/Resources/views/br/admin/company/edit-logo.twig
@@ -12,7 +12,7 @@
         <br />
         <h1>Current Logo</h1>
         {% if company.getLogo() %}
-            <img src="/{{ logoPath }}/{{ company.getLogo() }}" alt="{{ company.getName() }}">
+            <img src="{{ url('br_company', {'action': 'logo', 'image': company.getLogo()}) }}" alt="{{ company.getName() }}" style="width: 100%; max-width: 120px;">
         {% else %}
             <i>This company currently has no logo.</i>
         {% endif %}
diff --git a/module/BrBundle/Resources/views/br/career/company/overview.twig b/module/BrBundle/Resources/views/br/career/company/overview.twig
index 8b2db08dd5..d802481b30 100644
--- a/module/BrBundle/Resources/views/br/career/company/overview.twig
+++ b/module/BrBundle/Resources/views/br/career/company/overview.twig
@@ -68,7 +68,7 @@
                                     $('<a>', {'href': '{{ url("br_career_company", {"action": "view"}) }}' + element.slug}).append(
                                         $('<span>').append(
                                             element.logo ?
-                                                $('<img>', {'src': '/{{ logoPath }}/' + element.logo, 'alt': element.name}).css({'max-height': '100px', 'max-width': '120px', 'vertical-align': 'middle'})
+                                                $('<img>', {'src': '{{ url("br_company_logo", {"action": "view", "image": ""}) }}' + element.logo, 'alt': element.name}).css({'max-height': '100px', 'max-width': '120px', 'vertical-align': 'middle'})
                                                 :
                                                 $('<h4>').html(element.name).css({'position': 'absolute', 'top': '0', 'left': '0', 'width': '120px', 'line-height': '20px'}),
                                             $('<span>').html(element.name).css({'position': 'absolute', 'bottom': '0', 'left': '0', 'width': '120px', 'line-height': '20px'})
diff --git a/module/BrBundle/Resources/views/br/career/company/view.twig b/module/BrBundle/Resources/views/br/career/company/view.twig
index 279df6d31d..cfb9ab528a 100644
--- a/module/BrBundle/Resources/views/br/career/company/view.twig
+++ b/module/BrBundle/Resources/views/br/career/company/view.twig
@@ -5,7 +5,7 @@
         <div class="col-sm-2">
             <div style="text-align: center">
                 {% if page.getCompany().getLogo() %}
-                    <img src="/{{ logoPath }}/{{ page.getCompany().getLogo() }}" alt="{{ page.getCompany().getName() }}" style="width: 100%; max-width: 120px">
+                    <img src="{{ url('br_companys', {'action': 'logo', 'image': page.getCompany().getLogo()}) }}" alt="{{ page.getCompany().getName() }}" style="width: 100%; max-width: 120px;">
                     <hr/>
                 {% else %}
                     <div style="height: 60px">
@@ -35,7 +35,7 @@
             <h1>{{ page.getCompany().getName() }}</h1>
             <div class="container">
                 <div class="page-header">
-                    <h2>{{translate('About')}}</h2>      
+                    <h2>{{translate('About')}}</h2>
                 </div>
                 <p>
                     {% autoescape false %}
diff --git a/module/BrBundle/Resources/views/br/career/event/view.twig b/module/BrBundle/Resources/views/br/career/event/view.twig
index 1c6c93ddcf..30f094f810 100644
--- a/module/BrBundle/Resources/views/br/career/event/view.twig
+++ b/module/BrBundle/Resources/views/br/career/event/view.twig
@@ -9,7 +9,7 @@
 
             <div style="text-align: center">
                 {% if event.getCompany().getLogo() %}
-                    <img src="/{{ logoPath }}/{{ event.getCompany().getLogo() }}" alt="{{ event.getCompany().getName() }}" style="width: 100%; max-width: 120px">
+                    <img src="{{ url('br_company', {'action': 'logo', 'image': event.getCompany().getLogo()}) }}" alt="{{ event.getCompany().getName() }}" style="width: 100%; max-width: 120px;">
                 {% else %}
                     <h2><center class="company-name">{{ event.getCompany().getName() }}</center></h2>
                 {% endif %}
diff --git a/module/BrBundle/Resources/views/br/career/internship/overview.twig b/module/BrBundle/Resources/views/br/career/internship/overview.twig
index b9bab5b428..9978db4000 100644
--- a/module/BrBundle/Resources/views/br/career/internship/overview.twig
+++ b/module/BrBundle/Resources/views/br/career/internship/overview.twig
@@ -64,7 +64,7 @@
                         <td width="120">
                             <a href="{{ url('br_career_internship', {'action': 'view', 'id': internship.getId() }) }}">
                                 {% if internship.getCompany().getLogo() is not empty %}
-                                    <img width="120" src="/{{ logoPath }}/{{ internship.getCompany().getLogo() }}" alt="{{ internship.getCompany().getName() }}">
+                                    <img src="{{ url('br_company', {'action': 'logo', 'image': internship.getCompany().getLogo()}) }}" alt="{{ internship.getCompany().getName() }}" style="width: 100%; max-width: 120px;">
                                 {% else %}
                                     <center class="company-name">{{ internship.getCompany().getName() }}</center>
                                 {% endif %}
diff --git a/module/BrBundle/Resources/views/br/career/internship/view.twig b/module/BrBundle/Resources/views/br/career/internship/view.twig
index 867cf08b68..658103d135 100644
--- a/module/BrBundle/Resources/views/br/career/internship/view.twig
+++ b/module/BrBundle/Resources/views/br/career/internship/view.twig
@@ -19,7 +19,7 @@
 
             <div style="text-align: center;">
                 {% if internship.getCompany().getLogo() %}
-                    <img src="/{{ logoPath }}/{{ internship.getCompany().getLogo() }}" alt="{{ internship.getCompany().getName() }}" style="width: 100%; max-width: 120px">
+                    <img src="{{ url('br_company', {'action': 'logo', 'image': internship.getCompany().getLogo()}) }}" alt="{{ internship.getCompany().getName() }}" style="width: 100%; max-width: 120px;">
                 {% else %}
                     <h2><center class="company-name">{{ internship.getCompany().getName() }}</center></h2>
                 {% endif %}
diff --git a/module/BrBundle/Resources/views/br/career/vacancy/overview.twig b/module/BrBundle/Resources/views/br/career/vacancy/overview.twig
index 9819a2cd31..1e4b68f8aa 100644
--- a/module/BrBundle/Resources/views/br/career/vacancy/overview.twig
+++ b/module/BrBundle/Resources/views/br/career/vacancy/overview.twig
@@ -60,7 +60,7 @@
                         <td width="120">
                             <a href="{{ url('br_career_vacancy', {'action': 'view', 'id': vacancy.getId() }) }}">
                                 {% if vacancy.getCompany().getLogo() is not empty %}
-                                    <img width="120" src="/{{ logoPath }}/{{ vacancy.getCompany().getLogo() }}" alt="{{ vacancy.getCompany().getName() }}">
+                                    <img src="{{ url('br_company', {'action': 'logo', 'image': vacancy.getCompany().getLogo()}) }}" alt="{{ vacancy.getCompany().getName() }}" style="width: 100%; max-width: 120px;">
                                 {% else %}
                                     <center class="company-name">{{ vacancy.getCompany().getName() }}</center>
                                 {% endif %}
diff --git a/module/BrBundle/Resources/views/br/career/vacancy/view.twig b/module/BrBundle/Resources/views/br/career/vacancy/view.twig
index 0590b9d414..a8e608a75b 100644
--- a/module/BrBundle/Resources/views/br/career/vacancy/view.twig
+++ b/module/BrBundle/Resources/views/br/career/vacancy/view.twig
@@ -19,7 +19,7 @@
 
             <div style="text-align: center">
                 {% if vacancy.getCompany().getLogo() %}
-                    <img src="/{{ logoPath }}/{{ vacancy.getCompany().getLogo() }}" alt="{{ vacancy.getCompany().getName() }}" style="width: 100%; max-width: 120px">
+                    <img src="{{ url('br_company', {'action': 'logo', 'image': vacancy.getCompany().getLogo()}) }}" alt="{{ vacancy.getCompany().getName() }}" style="width: 100%; max-width: 120px;">
                 {% else %}
                     <h2><center class="company-name">{{ vacancy.getCompany().getName() }}</center></h2>
                 {% endif %}
diff --git a/module/BrBundle/Resources/views/br/company/logo.twig b/module/BrBundle/Resources/views/br/company/logo.twig
new file mode 100644
index 0000000000..1930e6cabc
--- /dev/null
+++ b/module/BrBundle/Resources/views/br/company/logo.twig
@@ -0,0 +1 @@
+{{ data|raw }}
diff --git a/module/BrBundle/Resources/views/br/company/logo/view.twig b/module/BrBundle/Resources/views/br/company/logo/view.twig
new file mode 100644
index 0000000000..1930e6cabc
--- /dev/null
+++ b/module/BrBundle/Resources/views/br/company/logo/view.twig
@@ -0,0 +1 @@
+{{ data|raw }}
diff --git a/module/BrBundle/Resources/views/br/corporate/internship/overview.twig b/module/BrBundle/Resources/views/br/corporate/internship/overview.twig
index 92de1d2631..cdf0eb0b98 100644
--- a/module/BrBundle/Resources/views/br/corporate/internship/overview.twig
+++ b/module/BrBundle/Resources/views/br/corporate/internship/overview.twig
@@ -46,7 +46,7 @@
                         <td width="120">
                             <a href="{{ url('br_career_internship', {'action': 'view', 'id': internship.getId() }) }}">
                                 {% if internship.getCompany().getLogo() is not empty %}
-                                    <img width="120" src="/{{ logoPath }}/{{ internship.getCompany().getLogo() }}" alt="{{ internship.getCompany().getName() }}">
+                                    <img src="{{ url('br_company', {'action': 'logo', 'image': internship.getCompany().getLogo()}) }}" alt="{{ internship.getCompany().getName() }}" style="width: 100%; max-width: 120px;">
                                 {% else %}
                                     <center class="company-name">{{ internship.getCompany().getName() }}</center>
                                 {% endif %}
diff --git a/module/BrBundle/Resources/views/br/corporate/vacancy/overview.twig b/module/BrBundle/Resources/views/br/corporate/vacancy/overview.twig
index 98be06079d..6d823ce8ea 100644
--- a/module/BrBundle/Resources/views/br/corporate/vacancy/overview.twig
+++ b/module/BrBundle/Resources/views/br/corporate/vacancy/overview.twig
@@ -46,7 +46,7 @@
                             <td width="120">
                                 <a href="{{ url('br_career_vacancy', {'action': 'view', 'id': vacancy.getId() }) }}">
                                     {% if vacancy.getCompany().getLogo() is not empty %}
-                                        <img width="120" src="/{{ logoPath }}/{{ vacancy.getCompany().getLogo() }}" alt="{{ vacancy.getCompany().getName() }}">
+                                        <img src="{{ url('br_company', {'action': 'logo', 'image': vacancy.getCompany().getLogo()}) }}" alt="{{ vacancy.getCompany().getName() }}" style="width: 100%; max-width: 120px;">
                                     {% else %}
                                         <center class="company-name">{{ vacancy.getCompany().getName() }}</center>
                                     {% endif %}
diff --git a/module/CalendarBundle/Controller/Admin/CalendarController.php b/module/CalendarBundle/Controller/Admin/CalendarController.php
index 31af861f2a..03aa3a1386 100644
--- a/module/CalendarBundle/Controller/Admin/CalendarController.php
+++ b/module/CalendarBundle/Controller/Admin/CalendarController.php
@@ -193,23 +193,29 @@ public function editPosterAction()
 
     private function receive($file, Event $event)
     {
-        $filePath = $this->getEntityManager()
-            ->getRepository('CommonBundle\Entity\General\Config')
-            ->getConfigValue('calendar.poster_path');
-
-        $image = new Imagick($file['tmp_name']);
-
-        if ($event->getPoster() != '' || $event->getPoster() !== null) {
-            $fileName = '/' . $event->getPoster();
-        } else {
-            do {
-                $fileName = '/' . sha1(uniqid());
-            } while (file_exists($filePath . $fileName));
+        if ($event->getPoster() !== null) {
+            $path = $this->getPath(
+                'calendar_events_posters',
+                $event->getPoster()
+            );
+
+            if ($this->getFilesystem()->has($path)) {
+                $this->getFilesystem()->delete($path);
+            }
         }
 
-        $image->writeImage($filePath . $fileName);
+        do {
+            $poster = sha1(uniqid());
+            $path = $this->getStoragePath('calendar_events_posters', $poster);
+        } while ($this->getFilesystem()->has($path));
+
+        $stream = fopen($file['tmp_name'], 'r+');
+        $this->getFilesystem()->writeStream($path, $stream);
+        if (is_resource($stream)) {
+            fclose($stream);
+        }
 
-        $event->setPoster($fileName);
+        $event->setPoster($poster);
     }
 
     public function uploadAction()
@@ -277,25 +283,28 @@ public function posterAction()
             return new ViewModel();
         }
 
-        $filePath = $this->getEntityManager()
-            ->getRepository('CommonBundle\Entity\General\Config')
-            ->getConfigValue('calendar.poster_path') . '/';
+        $path = $this->getStoragePath(
+            'calendar_events_posters',
+            $event->getPoster()
+        );
+
+        if (!$this->getFilesystem()->has($path)) {
+            return $this->notFoundAction();
+        }
 
         $headers = new Headers();
         $headers->addHeaders(
             array(
-                'Content-Type' => mime_content_type($filePath . $event->getPoster()),
+                'Content-Disposition' => 'inline; filename="' . $event->getPoster() . '"',
+                'Content-Type'        => $this->getFilesystem()->getMimetype($path),
+                'Content-Length'      => $this->getFilesystem()->getSize($path),
             )
         );
         $this->getResponse()->setHeaders($headers);
 
-        $handle = fopen($filePath . $event->getPoster(), 'r');
-        $data = fread($handle, filesize($filePath . $event->getPoster()));
-        fclose($handle);
-
         return new ViewModel(
             array(
-                'data' => $data,
+                'data' => $this->getFilesystem()->read($path),
             )
         );
     }
diff --git a/module/CalendarBundle/Controller/CalendarController.php b/module/CalendarBundle/Controller/CalendarController.php
index 8c17b742b1..c1dd2381f8 100644
--- a/module/CalendarBundle/Controller/CalendarController.php
+++ b/module/CalendarBundle/Controller/CalendarController.php
@@ -73,28 +73,31 @@ public function posterAction()
     {
         $event = $this->getEventEntityByPoster();
         if ($event === null) {
-            return $this->notFoundAction();
+            return new ViewModel();
         }
 
-        $filePath = $this->getEntityManager()
-            ->getRepository('CommonBundle\Entity\General\Config')
-            ->getConfigValue('calendar.poster_path') . '/';
+        $path = $this->getStoragePath(
+            'calendar_events_posters',
+            $event->getPoster()
+        );
+
+        if (!$this->getFilesystem()->has($path)) {
+            return $this->notFoundAction();
+        }
 
         $headers = new Headers();
         $headers->addHeaders(
             array(
-                'Content-Type' => mime_content_type($filePath . $event->getPoster()),
+                'Content-Disposition' => 'inline; filename="' . $event->getPoster() . '"',
+                'Content-Type'        => $this->getFilesystem()->getMimetype($path),
+                'Content-Length'      => $this->getFilesystem()->getSize($path),
             )
         );
         $this->getResponse()->setHeaders($headers);
 
-        $handle = fopen($filePath . $event->getPoster(), 'r');
-        $data = fread($handle, filesize($filePath . $event->getPoster()));
-        fclose($handle);
-
         return new ViewModel(
             array(
-                'data' => $data,
+                'data' => $this->getFilesystem()->read($path),
             )
         );
     }
diff --git a/module/CalendarBundle/Resources/config/storage.config.php b/module/CalendarBundle/Resources/config/storage.config.php
new file mode 100644
index 0000000000..3a9bacd5ed
--- /dev/null
+++ b/module/CalendarBundle/Resources/config/storage.config.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Litus is a project by a group of students from the KU Leuven. The goal is to create
+ * various applications to support the IT needs of student unions.
+ *
+ * @author Niels Avonds <niels.avonds@litus.cc>
+ * @author Karsten Daemen <karsten.daemen@litus.cc>
+ * @author Koen Certyn <koen.certyn@litus.cc>
+ * @author Bram Gotink <bram.gotink@litus.cc>
+ * @author Dario Incalza <dario.incalza@litus.cc>
+ * @author Pieter Maene <pieter.maene@litus.cc>
+ * @author Kristof Mariën <kristof.marien@litus.cc>
+ * @author Lars Vierbergen <lars.vierbergen@litus.cc>
+ * @author Daan Wendelen <daan.wendelen@litus.cc>
+ * @author Mathijs Cuppens <mathijs.cuppens@litus.cc>
+ * @author Floris Kint <floris.kint@vtk.be>
+ *
+ * @license http://litus.cc/LICENSE
+ */
+
+return array(
+    'directories' => array(
+        'calendar_events_posters' => 'calendar/events_posters',
+    ),
+);
diff --git a/module/CalendarBundle/Resources/views/calendar/admin/calendar/edit-poster.twig b/module/CalendarBundle/Resources/views/calendar/admin/calendar/edit-poster.twig
index 5c477c680f..8947474fc5 100644
--- a/module/CalendarBundle/Resources/views/calendar/admin/calendar/edit-poster.twig
+++ b/module/CalendarBundle/Resources/views/calendar/admin/calendar/edit-poster.twig
@@ -39,7 +39,7 @@
                 </div>
                 <div class="modal-body">
                     <p>
-                        Your files are being uploaded.
+                        Your file is being uploaded.
                     </p>
                     <p>
                         <div class="progress progress-striped active">
diff --git a/module/CommonBundle/Component/Controller/ActionController.php b/module/CommonBundle/Component/Controller/ActionController.php
index 8df770e6d6..289b2c711f 100644
--- a/module/CommonBundle/Component/Controller/ActionController.php
+++ b/module/CommonBundle/Component/Controller/ActionController.php
@@ -27,6 +27,7 @@
 use CommonBundle\Component\ServiceManager\ServiceLocatorAware\CacheTrait;
 use CommonBundle\Component\ServiceManager\ServiceLocatorAware\ConfigTrait;
 use CommonBundle\Component\ServiceManager\ServiceLocatorAware\DoctrineTrait;
+use CommonBundle\Component\ServiceManager\ServiceLocatorAware\FlySystemTrait;
 use CommonBundle\Component\ServiceManager\ServiceLocatorAware\FormFactoryTrait;
 use CommonBundle\Component\ServiceManager\ServiceLocatorAware\MailTransportTrait;
 use CommonBundle\Component\ServiceManager\ServiceLocatorAware\RedisClientTrait;
@@ -67,6 +68,7 @@ class ActionController extends \Zend\Mvc\Controller\AbstractActionController imp
     use CacheTrait;
     use ConfigTrait;
     use DoctrineTrait;
+    use FlySystemTrait;
     use FormFactoryTrait;
     use MailTransportTrait;
     use RedisClientTrait;
@@ -524,4 +526,28 @@ protected function getEntityById($entityName, $paramKey = 'id', $entityKey = 'id
 
         return $entity;
     }
+
+    /**
+     * @param  string            $directory
+     * @param  string|array|null $resource
+     * @return string|null
+     */
+    protected function getStoragePath($directory, $resource = null)
+    {
+        $config = $this->getConfig();
+        if (!isset($config['litus']['storage']['directories'][$directory])) {
+            return null;
+        }
+
+        $path = $config['litus']['storage']['directories'][$directory];
+        if ($resource !== null) {
+            if (is_array($resource)) {
+                $resource = implode('/', $resource);
+            }
+
+            $path .= '/' . $resource;
+        }
+
+        return $path;
+    }
 }
diff --git a/module/CommonBundle/Component/Controller/ActionController/SiteController.php b/module/CommonBundle/Component/Controller/ActionController/SiteController.php
index 47c52b9cb9..ab1659c6b1 100644
--- a/module/CommonBundle/Component/Controller/ActionController/SiteController.php
+++ b/module/CommonBundle/Component/Controller/ActionController/SiteController.php
@@ -70,10 +70,6 @@ public function onDispatch(MvcEvent $e)
             ->getRepository('BrBundle\Entity\Company\Logo')
             ->findAllByType('homepage');
 
-        $result->logoPath = $this->getEntityManager()
-            ->getRepository('CommonBundle\Entity\General\Config')
-            ->getConfigValue('br.public_logo_path');
-
         if ($this->getRequest() instanceof HttpRequest) {
             $result->showCookieBanner = !isset($this->getRequest()->getCookie()->cookie_permission);
         } else {
diff --git a/module/CommonBundle/Component/Module/Config.php b/module/CommonBundle/Component/Module/Config.php
index be6b7e9090..609f840593 100644
--- a/module/CommonBundle/Component/Module/Config.php
+++ b/module/CommonBundle/Component/Module/Config.php
@@ -95,11 +95,11 @@
  *       $settings = array(
  *           'namespace'         =>         , // required, the namespace of the bundle to configure
  *           'directory'         =>         , // required, the directory of the module.config.php file
- *           'has_entities'      => true    , // optional, whether or not the bundle has entities
- *           'has_documents'     => false   , // optional, whether or not the bundle has documents
  *           'translation_files' => array() , // optional, files in ../translations for i18n
- *           'has_views'         => true    , // optional, whether the bundle has Twig views
+ *
+ *           'has_entities'      => true    , // optional, whether or not the bundle has entities
  *           'has_layouts'       => false   , // optional, whether the bundle has Twig layouts
+ *           'has_views'         => true    , // optional, whether the bundle has Twig views
  *       );
  *       $override = array(
  *           // elements in this array are merged into the result of the method before it is returned
@@ -113,104 +113,39 @@
 class Config
 {
     /**
-     * Loads the file in the directory if it exists, returns empty array otherwise.
-     *
-     * @param  string $directory the directory containing the file
-     * @param  string $file      the file to load
-     * @return mixed
+     * @return array
      */
-    private static function load($directory, $file)
-    {
-        $file = $directory . '/' . $file;
-        if (file_exists($file)) {
-            return include $file;
-        } else {
-            return array();
-        }
-    }
-
-    private static function createTranslationConfig(array $settings)
-    {
-        if (!array_key_exists('translation_files', $settings)) {
-            return array();
-        }
-
-        $translationFiles = array();
-        $directory = $settings['directory'];
-        foreach ($settings['translation_files'] as $translationFile) {
-            $translationFiles[] = array(
-                'type'     => 'phparray',
-                'base_dir' => $directory . '/../translations',
-                'pattern'  => $translationFile . '.%s.php',
-            );
-        }
-
-        return $translationFiles;
-    }
-
-    private static function createDoctrineConfig(array $settings)
+    public static function create(array $settings, array $override = array())
     {
-        $doctrine = array();
         $directory = $settings['directory'];
-        $namespace = $settings['namespace'];
+        $routerConfig = self::load($directory, 'router.config.php');
 
-        // include entities by default
-        if (!array_key_exists('has_entities', $settings) || $settings['has_entities']) {
-            $doctrine['orm_default'] = array(
-                'drivers' => array(
-                    $namespace . '\Entity' => 'orm_annotation_driver',
-                ),
-            );
-            $doctrine['orm_annotation_driver'] = array(
-                'paths' => array(
-                    $namespace => $directory . '/../../Entity',
+        return array_merge_recursive(
+            array(
+                'router' => array(
+                    'routes' => array_key_exists('routes', $routerConfig) ? $routerConfig['routes'] : array(),
                 ),
-            );
-        }
-
-        // don't include documents by default
-        if (array_key_exists('has_documents', $settings) && $settings['has_documents']) {
-            $doctrine['odm_default'] = array(
-                'drivers' => array(
-                    $namespace . '\Document' => 'odm_annotation_driver',
+                'controllers' => array(
+                    'invokables' => array_key_exists('controllers', $routerConfig) ? $routerConfig['controllers'] : array(),
                 ),
-            );
-            $doctrine['odm_annotation_driver'] = array(
-                'paths' => array(
-                    $namespace => $directory . '/../../Document',
+                'translator' => array(
+                    'translation_file_patterns' => self::createTranslationConfig($settings),
                 ),
-            );
-        }
-
-        return $doctrine;
-    }
-
-    private static function createViewManagerConfig(array $settings)
-    {
-        // include view by default
-        $hasView = !array_key_exists('has_views', $settings) || $settings['has_views'];
-
-        // don't include layout by default
-        $hasLayout = array_key_exists('has_layouts', $settings) && $settings['has_layouts'];
-
-        if (!$hasView && !$hasLayout) {
-            return array();
-        }
-
-        $directory = $settings['directory'];
-        $namespace = $settings['namespace'];
-        $bundleName = str_replace('bundle', '', strtolower($namespace));
+                'view_manager' => self::createViewManagerConfig($settings),
 
-        $templatePathStack = array();
-        if ($hasLayout) {
-            $templatePathStack[$bundleName . '_layout'] = $directory . '/../layouts';
-        }
-        if ($hasView) {
-            $templatePathStack[$bundleName . '_view'] = $directory . '/../views';
-        }
+                'assetic_configuration' => self::createAsseticConfig($settings),
+                'doctrine' => array(
+                    'driver' => self::createDoctrineConfig($settings),
+                ),
 
-        return array(
-            'template_path_stack' => $templatePathStack,
+                'litus' => array(
+                    'admin'   => self::load($directory, 'admin.config.php'),
+                    'console' => self::load($directory, 'console.config.php'),
+                    'install' => self::createInstallConfig($settings),
+                    'storage' => self::load($directory, 'storage.config.php'),
+                ),
+            ),
+            $override
         );
     }
 
@@ -266,43 +201,91 @@ private static function createInstallConfig(array $settings)
         );
     }
 
-    /**
-     *
-     * @return array
-     */
-    public static function create(array $settings, array $override = array())
+    private static function createDoctrineConfig(array $settings)
     {
+        $doctrine = array();
         $directory = $settings['directory'];
-        $routerConfig = self::load($directory, 'router.config.php');
+        $namespace = $settings['namespace'];
 
-        return array_merge_recursive(
-            array(
-                'router' => array(
-                    'routes' => array_key_exists('routes', $routerConfig) ? $routerConfig['routes'] : array(),
+        // include entities by default
+        if (!array_key_exists('has_entities', $settings) || $settings['has_entities']) {
+            $doctrine['orm_default'] = array(
+                'drivers' => array(
+                    $namespace . '\Entity' => 'orm_annotation_driver',
                 ),
-                'controllers' => array(
-                    'invokables' => array_key_exists('controllers', $routerConfig) ? $routerConfig['controllers'] : array(),
+            );
+            $doctrine['orm_annotation_driver'] = array(
+                'paths' => array(
+                    $namespace => $directory . '/../../Entity',
                 ),
+            );
+        }
 
-                'translator' => array(
-                    'translation_file_patterns' => self::createTranslationConfig($settings),
-                ),
+        return $doctrine;
+    }
 
-                'doctrine' => array(
-                    'driver' => self::createDoctrineConfig($settings),
-                ),
+    private static function createTranslationConfig(array $settings)
+    {
+        if (!array_key_exists('translation_files', $settings)) {
+            return array();
+        }
 
-                'assetic_configuration' => self::createAsseticConfig($settings),
+        $translationFiles = array();
+        $directory = $settings['directory'];
+        foreach ($settings['translation_files'] as $translationFile) {
+            $translationFiles[] = array(
+                'type'     => 'phparray',
+                'base_dir' => $directory . '/../translations',
+                'pattern'  => $translationFile . '.%s.php',
+            );
+        }
 
-                'view_manager' => self::createViewManagerConfig($settings),
+        return $translationFiles;
+    }
 
-                'litus' => array(
-                    'admin'   => self::load($directory, 'admin.config.php'),
-                    'install' => self::createInstallConfig($settings),
-                    'console' => self::load($directory, 'console.config.php'),
-                ),
-            ),
-            $override
+    private static function createViewManagerConfig(array $settings)
+    {
+        // include view by default
+        $hasView = !array_key_exists('has_views', $settings) || $settings['has_views'];
+
+        // don't include layout by default
+        $hasLayout = array_key_exists('has_layouts', $settings) && $settings['has_layouts'];
+
+        if (!$hasView && !$hasLayout) {
+            return array();
+        }
+
+        $directory = $settings['directory'];
+        $namespace = $settings['namespace'];
+        $bundleName = str_replace('bundle', '', strtolower($namespace));
+
+        $templatePathStack = array();
+        if ($hasLayout) {
+            $templatePathStack[$bundleName . '_layout'] = $directory . '/../layouts';
+        }
+        if ($hasView) {
+            $templatePathStack[$bundleName . '_view'] = $directory . '/../views';
+        }
+
+        return array(
+            'template_path_stack' => $templatePathStack,
         );
     }
+
+    /**
+     * Loads the file in the directory if it exists, returns empty array otherwise.
+     *
+     * @param  string $directory the directory containing the file
+     * @param  string $file      the file to load
+     * @return mixed
+     */
+    private static function load($directory, $file)
+    {
+        $file = $directory . '/' . $file;
+        if (file_exists($file)) {
+            return include $file;
+        } else {
+            return array();
+        }
+    }
 }
diff --git a/module/CommonBundle/Component/ServiceManager/ServiceLocatorAware/FlySystemTrait.php b/module/CommonBundle/Component/ServiceManager/ServiceLocatorAware/FlySystemTrait.php
new file mode 100644
index 0000000000..48ab89cc1e
--- /dev/null
+++ b/module/CommonBundle/Component/ServiceManager/ServiceLocatorAware/FlySystemTrait.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Litus is a project by a group of students from the KU Leuven. The goal is to create
+ * various applications to support the IT needs of student unions.
+ *
+ * @author Niels Avonds <niels.avonds@litus.cc>
+ * @author Karsten Daemen <karsten.daemen@litus.cc>
+ * @author Koen Certyn <koen.certyn@litus.cc>
+ * @author Bram Gotink <bram.gotink@litus.cc>
+ * @author Dario Incalza <dario.incalza@litus.cc>
+ * @author Pieter Maene <pieter.maene@litus.cc>
+ * @author Kristof Mariën <kristof.marien@litus.cc>
+ * @author Lars Vierbergen <lars.vierbergen@litus.cc>
+ * @author Daan Wendelen <daan.wendelen@litus.cc>
+ * @author Mathijs Cuppens <mathijs.cuppens@litus.cc>
+ * @author Floris Kint <floris.kint@vtk.be>
+ *
+ * @license http://litus.cc/LICENSE
+ */
+
+namespace CommonBundle\Component\ServiceManager\ServiceLocatorAware;
+
+/**
+ * A trait to define some common methods for classes with a ServiceLocator.
+ *
+ * @author Pieter Maene <pieter.maene@litus.cc>
+ */
+
+trait FlySystemTrait
+{
+    /**
+     * @return \League\Flysystem\Filesystem
+     */
+    public function getFilesystem()
+    {
+        return $this->getServiceLocator()->get('filesystem');
+    }
+
+    /**
+     * @return \Zend\ServiceManager\ServiceLocatorInterface
+     */
+    abstract public function getServiceLocator();
+}
diff --git a/module/CommonBundle/Resources/config/module.config.php b/module/CommonBundle/Resources/config/module.config.php
index 51718bb672..46c1a2e300 100644
--- a/module/CommonBundle/Resources/config/module.config.php
+++ b/module/CommonBundle/Resources/config/module.config.php
@@ -48,8 +48,10 @@
 use CommonBundle\Component\Validator\ServiceManager\AbstractValidatorFactory;
 use CommonBundle\Component\View\Helper\ServiceManager\AbstractHelperFactory;
 use Doctrine\Common\Cache\RedisCache as DoctrineRedisCache;
+use League\Flysystem\Filesystem;
 use Raven_Client;
 use Symfony\Component\Console\Application as ConsoleApplication;
+use WShafer\PSR11FlySystem\FlySystemFactory;
 use Zend\Cache\Storage\StorageInterface as CacheStorage;
 use Zend\Form\ElementFactory;
 use Zend\I18n\Translator\Resources as TranslatorResources;
@@ -80,33 +82,34 @@
                 DoctrineCredentialAdapter::class => DoctrineCredentialAdapterFactory::class,
                 DoctrineRedisCache::class        => DoctrineRedisCacheFactory::class,
                 DoctrineService::class           => DoctrineServiceFactory::class,
+                Filesystem::class                => FlySystemFactory::class,
                 FormFactory::class               => FormFactoryFactory::class,
                 HydratorPluginManager::class     => HydratorPluginManagerFactory::class,
+                ManagerInterface::class          => SessionManagerFactory::class,
                 Raven_Client::class              => RavenClientFactory::class,
                 RedisClient::class               => RedisClientFactory::class,
                 Sendmail::class                  => InvokableFactory::class,
                 SentryClient::class              => SentryClientFactory::class,
                 SessionContainer::class          => SessionContainerFactory::class,
-                ManagerInterface::class          => SessionManagerFactory::class,
             ),
             'abstract_factories' => array(
                 AbstractInstallerFactory::class,
             ),
             'aliases' => array(
-                'authentication'                    => Authentication::class,
                 'authentication_credential_adapter' => DoctrineCredentialAdapter::class,
                 'authentication_service'            => DoctrineService::class,
+                'authentication'                    => Authentication::class,
                 'cache'                             => CacheStorage::class,
                 'console'                           => ConsoleApplication::class,
-                'redis_client'                      => RedisClient::class,
+                'doctrine.cache.redis'              => DoctrineRedisCache::class,
+                'filesystem'                        => Filesystem::class,
                 'hydrator_plugin_manager'           => HydratorPluginManager::class,
                 'mail_transport'                    => Sendmail::class,
                 'raven_client'                      => Raven_Client::class,
+                'redis_client'                      => RedisClient::class,
                 'sentry_client'                     => SentryClient::class,
                 'session_container'                 => SessionContainer::class,
                 'translator'                        => MvcTranslator::class,
-
-                'doctrine.cache.redis' => DoctrineRedisCache::class,
             ),
         ),
 
@@ -118,12 +121,12 @@
                 Component\Controller\Plugin\Url::class            => InvokableFactory::class,
             ),
             'aliases' => array(
-                'hasaccess'      => Component\Controller\Plugin\HasAccess::class,
-                'hasAccess'      => Component\Controller\Plugin\HasAccess::class,
-                'HasAccess'      => Component\Controller\Plugin\HasAccess::class,
                 'flashmessenger' => Component\Controller\Plugin\FlashMessenger::class,
                 'flashMessenger' => Component\Controller\Plugin\FlashMessenger::class,
                 'FlashMessenger' => Component\Controller\Plugin\FlashMessenger::class,
+                'hasaccess'      => Component\Controller\Plugin\HasAccess::class,
+                'hasAccess'      => Component\Controller\Plugin\HasAccess::class,
+                'HasAccess'      => Component\Controller\Plugin\HasAccess::class,
                 'paginator'      => Component\Controller\Plugin\Paginator::class,
                 'Paginator'      => Component\Controller\Plugin\Paginator::class,
                 'url'            => Component\Controller\Plugin\Url::class,
diff --git a/module/CommonBundle/Resources/layouts/site/base.twig b/module/CommonBundle/Resources/layouts/site/base.twig
index 034713f5ab..e7a462d87d 100644
--- a/module/CommonBundle/Resources/layouts/site/base.twig
+++ b/module/CommonBundle/Resources/layouts/site/base.twig
@@ -98,7 +98,7 @@
                                 {% endif %}
 
                                 <li>
-                                    <a href="{{ url("common_auth", {"action": "logout", "language": language.getAbbrev()}) }}">{{ translate('Logout') }}</a>
+                                    <a href="{{ url('common_auth', {'action': 'logout', 'language': language.getAbbrev()}) }}">{{ translate('Logout') }}</a>
                                 </li>
                             </ul>
                         </li>
@@ -176,7 +176,7 @@
                                     <li class="divider"></li>
                                 {% endif %}
                                 <li>
-                                    <a href="{{ url("common_auth", {"action": "logout", "language": language.getAbbrev()}) }}">{{ translate('Logout') }}</a>
+                                    <a href="{{ url('common_auth', {'action': 'logout', 'language': language.getAbbrev()}) }}">{{ translate('Logout') }}</a>
                                 </li>
                             </ul>
                         </li>
@@ -204,7 +204,7 @@
                                 {% if banner.getUrl() != '' %}
                                     <a href="{{ banner.getUrl() }}">
                                         {% endif %}
-                                            <img src="/banner/view/image{{ banner.getImage() }}" alt="">
+                                            <img src="{{ url('banner', {'action': 'view', 'image': banner.getImage()}) }}" alt="{{ banner.getName() }}">
                                         {% if banner.getUrl() != '' %}
                                     </a>
                                 {% endif %}
diff --git a/module/CudiBundle/Controller/Sale/QueueController.php b/module/CudiBundle/Controller/Sale/QueueController.php
index bc937b9b40..0e68d53c25 100644
--- a/module/CudiBundle/Controller/Sale/QueueController.php
+++ b/module/CudiBundle/Controller/Sale/QueueController.php
@@ -49,10 +49,6 @@ public function screenAction()
             ->getRepository('BrBundle\Entity\Company\Logo')
             ->findAllByType('cudi');
 
-        $logoPath = $this->getEntityManager()
-            ->getRepository('CommonBundle\Entity\General\Config')
-            ->getConfigValue('br.public_logo_path');
-
         $payDesks = $this->getEntityManager()
             ->getRepository('CudiBundle\Entity\Sale\PayDesk')
             ->findBy(array(), array('name' => 'ASC'));
@@ -76,8 +72,7 @@ public function screenAction()
                 'enableCollecting' => $this->getEntityManager()
                     ->getRepository('CommonBundle\Entity\General\Config')
                     ->getConfigValue('cudi.enable_collect_scanning'),
-                'logos'    => $logos,
-                'logoPath' => $logoPath,
+                'logos' => $logos,
             )
         );
     }
diff --git a/module/CudiBundle/Resources/views/cudi/sale/queue/screen.twig b/module/CudiBundle/Resources/views/cudi/sale/queue/screen.twig
index c56337c824..4f1da35e6d 100644
--- a/module/CudiBundle/Resources/views/cudi/sale/queue/screen.twig
+++ b/module/CudiBundle/Resources/views/cudi/sale/queue/screen.twig
@@ -107,7 +107,7 @@
             <footer>
                 <p class="companies">
                     {% for logo in logos %}
-                        <a href="{{ logo.getUrl() }}" target="_blank" style="background-image: url('/{{ logoPath }}/{{ logo.getPath() }}');height: 30px;width: {{ (logo.getWidth()*30/logo.getHeight())|number_format(0) }}px;"></a>
+                        <a href="{{ logo.getUrl() }}" target="_blank" style="background-image: url('{{ url('br_company_logo', {'action': 'view', 'image': logo.getImage()}) }}'); height: 30px; width: {{ (logo.getWidth()*30/logo.getHeight())|number_format(0) }}px;"></a>
                     {% endfor %}
                 </p>
             </footer>
diff --git a/public/_br/img/README.md b/public/_br/img/README.md
deleted file mode 100644
index 16cfe77757..0000000000
--- a/public/_br/img/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-About this Directory
-====================
-
-This directory is used to store files for the public company logo's,
-and as such should be writeable by the webserver