move EnhancedCommentify to bundle