Re-arranged folder structure.