Added more robust recursive make structure; started on SonsOfSol infrastructure