Organized the classes