New folder structure in Assignment 3
Merge remote-tracking branch 'origin'