Final revision to initial project structure