reworking editor app to use new structure