Added extra info msg
Cleanup and restructuring for server
Cleanup in client and server