Moved everything into Express app