Feature/805 project structure

Something is wrong with the formatter here