package reorg

Just reorganized some packages.  No code changes.