Chapter 3. part 1

Now with folders!