Rearranged the directory structure