Week 4 commit

Fixed directroies and updated app