Added package map, reorg'd some things
Merge pull request #2 from KennethWilke/master

Added package map, reorg'd some things