Pulled enums into own source files
Fixed some dependency breakage that occured with enum extraction