small code reorganization
new binary