Project structure management (optimization bugfix)