Moved models back into API project