refactoring

optimization for download speed: less files to download