Updated file structure for use as subrepo.