Reorganized files into something more reasonable.