Fix for the new SDK structure
Merge pull request #205 from Shusshu/issue-sdk-structure

Fix for the new SDK structure