Metronome, refactor structure