Started to refactor console app