Merging from server
merging from server
Removed  unwanted directory