Synchronized to 0.5.7.22

Updated Structure to match latest SDK/Samples