Pull request: Closes #468 Move wysiwyg code to its own module

#468