delete out m2 specific files
merged in mako files that we need from cm11-m10
more mako specific files