Done with Assignment 2 & 3. Restructured files for assignment 1