removed some unneeded dto classes and added in more appropiate dtos where dynamic stuff isn't needed.