Moved original SDK, and added some bits for the new SDK