Re-arranged the structure.