move stuff around
rename Mi tags to their MAIN name