change mk files to be more CM-ish. Remove redundant files as to rely more heavily on d2