More cleaning up and moving around

hard to test appBuilder? maybe test that it returns an app?
not clear what all the express setup means