reorganized stucture