Moved enums into new enums.hpp in anticipation of more