Moved org configuration to its own file