Attempting to fix folder structure.