Moving suburbs to correct states