Move Dataset class to utils and refactor it