Refactored, all classes but Dice in own files