Use new main repo directory structure