Rearranged the file tree a bit.