MAC SDK refactor details


#1


closed #2