merging in the single file based project

merging in the single file based project