Rearranged files to simplify structure.