Moving tracking class to correct package
Fixing some issues with eAdventure 2.0 integration