Normalize name of some classes
Implement Zig-zag level ordering
Normalize class name
Minor updates
Ready to add a new method for testing
Minor updates