Delete content-specific classes and mvc components.
Merge branch 'Issue006' into Issue005