Move scoop.flx to bin
Misc adjustments