major changes in client and common files structure