Slightly better code layout

Can't show this merge request because the source branch github/fork/murbanski/patch-1 is missing from project import-export-testing-group/gitlabhq_1662339666. Close this merge request or update the source branch.