restructure fixes