Better re-organization of the client side maven modules