Refactor sections into include files