Refactoring of GTrackCoreSuite