major redesign, remove unused files