Module 8 updates

Re-organizing.