Moving Attribute Enum to it's own file and package