adapt to changed module hierarchy