Reorganized files to reduce dependencies.