Move utility classes to cf-enhancements
and content-related classes to layout.