Refactored package structure and build file

@leifdreizler
~requested: 100