Reorganizing some folders.