Refactor Directory/Views for Lesson 2, 3 and 4