Moving class marker to its own file