test package reorg
cleanup formatting