fixes to project org cleanups