Many changes, reorganization