Reorganized solution folders