Added bin/ from upstream
refactored