Change to new repo structure used by Sailor 0.2