Moved separate enums into same file