Move directories to better locations