More restructuring of ScholarTool