Feature/805 project structure

I think we need to revert this change