Re structured the code for more general growth, removed dependency on server/client to modules