Merge "Fix: Rename settings directories to standard"