more project cleanup and restructuring