Moved extensions into their appropriate modules.