Refactor, TDD and Console App added