Improved SDK strcuture;