Added package map, reorg'd some things