Refactoring and binary download