Base repo to be split into separate ones