Refactor server, upgrade express