Rearranged to make cleaner by deleting a folder.