The main entity should be theme instead of research group. Themes should now be called topics. Each topic should have N programmes, N research groups, and N thesis projects.