data fetching bug fixed.
files location modified