Minor file reorganisation [ci skip].