Added comments
Changed file names