First phase of shuffling classes around. Commits will be in english from now on.
Second phase of shuffling classes around.