Annotate the editor action in the entry dialog
Refactoring classes into namespaces that better describe their function