fix references after restructure