Code changes for the new folders.