Changed folder structure while I wait.