States cleanup
Reorganize motion models