Begin refactoring and add ckeditor support.