Project structure rebuild (cosmetic changes)