[#24] Actually added the new files in the right places.