Extract the marker class and put it into its own file.