fixing restructure issues