Refactor Movements Creation