Cleaned up folder structure of assignment 3