Sherlock restructure