Changed the orginization structure.