Moved managers to their own files
Revert "Moved managers to their own files"

This reverts commit f59609c4d4255844093462febbddfbb25805c0bf.
Moved managers to the top of the file
Added update fields