Moving things around for cleaner Namespacing that is more understandable to the developer for WYSIWYG