Cleaned up folder structure for assignment 3