Rearranged a few directories.