Slight change to package layout, because mr.awsome itself is no namespace package.
Fix test failures due to different order in set.