Moving scripts

TODO: Update tests