Re-arranged everything in preperation for the Express app.