New Modifications in directory stucture and some bug fixes on resource_server lib