Changed folder structure.