Two files were misplaced in the previous code reorganization.

review by @samarion @adriaanm