Trying to sort the project structure