removing old dir
merged files
last commit made on july15th 2014