complete reorder into project-based hierachy, deleted crap