refacting directory structure