Updating project structure

Hopefully clearer now