Restructured the document more logically