UPG-31: Update configurations to be located under the same directory.