Cleaning up folder structure in Assignment 2.2