Alisa movement refactoring
Merge pull request #1 from zyphlar/master

Merge movement refactoring changes