More work and cleaning on network layer.
Fixed package directory name.