Refactor packages to proper directories.

Fixed possible config error with naming of modes.