Changes to standarized folder structure.