Stucture changes in files and small changes to client.js
msall changes