Remove old path files and move new ones to standard locations.
Merge branch 'remove-conf'