Rearrange some deckchairs. Moving the class before it's use.