Moved enums out of enum package and into place where they are used