Dock config
Misc config
Remove old file (has been broken down into sub-files)