fixed and restructured everything for sdk 2.1.1