restructuring application to be outside of workbench