Fixed infinite loop in redirect

Renamed M to Mgr for clearification
Moved yml's to new config folder