Started refactoring in numbers.rb and renamed files accordingly