Changed structure of package to simply load sdk