moving files and adding minor changes from amit