Factor common subsections to their own files