Adds org configuration, removes the 'mk-' prefixes.