Considerable re-arrange.
removed binary
tidy