reorg package structure. updated tests