Added submodules for client and server component