rearranged directories and dependencies