Re-arranging some things.