Unite Move and GenericMove

trying to get rid of Move and use Flux's GenericMove everywhere.
runs fine. hope there are not mistakes. certainly needs some cleanup.
delete note file