Namespace changes
Chapter 6 code up and running!