Refactoring package names.

Messing with difficulty modes and stuff.