Add Hash and Full directories under  so as to make future logic simpler.  Reduce number of variables in all package generation scripts.