rearranged directory structure