Continue develop "track" functionality.
Solution structure change, rename some classes.
Test fix.