Update structure to accomodate subpackage Downloader