Reorganizing folders for clarity.