Reconfigure directories, start work on Week 2