Restructured packages.  Tweaked BlackSand generation to prevent
incorrect default decorators.