made some name changes
changed file name
rebased