Reorganized files to match install structure.