Merge "Move enums file to new directory"