reorg directory structure to conventions