move some express things around for a better initial structure