Correcting some folder structure issues.