Reorganize, expand