- renamed display name in pkg json because MS Marketplace said it conflicts (w/ itself as it turns out).;
- canonical layout reorg;