Move marker types into their own module