Added mcomponent to support, and removed trash files.