Hopefully fix folder structure.