Move enum to more appropriate class