Rebuilded project structure