Ongoing structural changes, project still does not compile