Fix counter display
Main restructuration
Refactor strategies
Refactor model
Refactor view