consolidate Controller and Content