Move marker classes to separate files.