moved methods from server to common scope
moved router from client to common scope
changes in routing