Reorganized classes into folders.