Re-arranged folder structure