Added config file for org.
Moved some settings around.