Moved some stuff around according to the CDR (no package, invalid config)
Merge pull request #15 from soeb/master

Moved some things around