Got the project imported to the new repo structure. 

Took a bit but everything should be building fine again.