Reorganized into modules. Added some work for week2