group sources
delete unused
cleanup
remove old
group sources
fix build