New approach for action #1658 - move does not need a from argument

Also I added some refactorization