Organized the object class