Changes to move configuration files to the same location to make deployment easier