Renaming folders to match convention. Temporary.