moved remaining keys to classes
changed to a module instead of a package
fixed scripts for module changes and made them more consistant
fixed setup script for module changes