Removed Glacier, rearranged organization