Merged corpus dir with corpus
Few more changes to File sync service