EPG-35885: move stubs to the right place