restructure, fixed imports
fixed a log error
working on downloader