fixed up ordering a bit, deleted a few obsolete files