more grouping, and removal of unused files