Feature/805 project structure

fixed https://github.com/akvo/akvo-flow/commit/0e06b96d9728738b5cf90c3567fc533ecb077425