Moved class distro from General to Options

Otherwise, everything depends on the Distro module, which
causes problems with circular dependencies.