Moved restructure into an issue.