Reorg'd the ST2 settings, added some packages.