Smaller modifications to project structure