Updated movement code and better modularized data.