Remove mk subdirectory in preparation for "git subtree"
Update Makefiles