Reorganize states