Merge the two repos, over-complicated to have them separate