Simplified file structure in repo.