Packages added and client/server split