Refs #416. Fixed code structure issue.
Refs #416. Fixed code structure issue.

samuelcole/wymeditor,samuelcole/wymeditor,samuelcole/wymeditor,samuelcole/wymeditor,samuelcole/wymeditor,samuelcole/wymeditor