restructuring object system, reorganizing code