Rearranged model namespaces.
Merge branch 'master' of https://github.com/osjoberg/Pillerkollen