Simplify client package

Simplify client package into single module
Simplify server package

Simplify server package into single module