Moving enum definitions to their own folder