Reorganized files into different files.