Moved more config stuff in org file.