Repo. layout improvements.