Major refactoring to get better overview of labeled and raw responses