Reorder presentation files and make consistent