MAC SDK refactor details


#1