restructure per issue