Update to modern version of packages
Change back to express 2.5.x
Better structure for distribution