moved responsability for assets / added controller layer