Reorganized the classes in bin.