refactor app, now that we don't use the gitlab shell anymore