Restructure research tools