Still recovering

Still rearranging solution and fixing build errors