Trying to fix folder structure.