bitflags instead enums
files were reorganized