split up objects, restructuring player