Further reorganized files for build simplicity.