change files location and add some comments