I think I did it.

Hopefully my push works. I moved the enum without breaking anything. The other enum I left because it isn't relevant anywhere else.