Moved the new stuff to directory-week-2.rb. Refactored the code somewhat.