great shuffling and cleaning; even fewer .java files now. Some metacircular tests don't pass again