Moved enumerations to specific package.