Remove redundant files, add MatchStartCountdown and a CountdownManager