added conversation and added more folders