update ImportExport

- refactor
- include Weekly Avg values