Merge pull request #2257 from reaperhulk/split-extensions-1

move AKI, SKI