Moved entities to ResearchRegistry as seemed most appropriate