move mask,us,mask_color to a proper module
update all unit tests