Rearranged the files and finished ex22