Restoring packages, making imports relative.
Merge branch 'master' of git@github.com:michielkauwatjoe/MusicHasTheRightToChildren.git