Namespacing movement.cpp
merge-fix