Removed extra packages, shortened number of folders to go through to get to code.