package and classes reorg