issue #2905: adjust folder structure