Adjusted folder structure.