Added folders and first 2 questions