Reorgonize lib directory with client and server import