Reorganizing code
Fixing end turn bug
Unit moving with bug fixes