- Move from Content to Cms naming
- Move to Services
- Cleanup Area and configuration