Move enums to separate files, tidy up a bit