reorg dir structure for less dependencies