Combine the plugins-settings into one file and misc cleanup