moved enum into its own file
adjusted imports
code cleanup