Minor rearrangements
ignoring class files