Update project structure again