modularized the server
Modularized the server
Some UI and server changes