Rename language to folder and improve configuration.