Try to restructure again