rafactoring for field and class changes
refactoring part 2
Merge branch 'master' of https://github.com/ruudvanderweijde/EvolutionAdvancedTrack