created new sections/company/folder and factored markup out