Add another level of package structure to DTO package

src/main/java/cz/muni/ics/kypo/training/adaptive/controller/PhasesController.java

 package cz.muni.ics.kypo.training.adaptive.controller;
 
 import cz.muni.ics.kypo.training.adaptive.dto.AbstractPhaseDTO;
-import cz.muni.ics.kypo.training.adaptive.dto.InfoPhaseDTO;
-import cz.muni.ics.kypo.training.adaptive.dto.InfoPhaseUpdateDTO;
 import cz.muni.ics.kypo.training.adaptive.dto.PhaseCreateDTO;
-import cz.muni.ics.kypo.training.adaptive.dto.QuestionnairePhaseDTO;
-import cz.muni.ics.kypo.training.adaptive.dto.QuestionnaireUpdateDTO;
-import cz.muni.ics.kypo.training.adaptive.dto.TrainingPhaseDTO;
-import cz.muni.ics.kypo.training.adaptive.dto.TrainingPhaseUpdateDTO;
+import cz.muni.ics.kypo.training.adaptive.dto.info.InfoPhaseDTO;
+import cz.muni.ics.kypo.training.adaptive.dto.info.InfoPhaseUpdateDTO;
+import cz.muni.ics.kypo.training.adaptive.dto.questionnaire.QuestionnairePhaseDTO;
+import cz.muni.ics.kypo.training.adaptive.dto.questionnaire.QuestionnaireUpdateDTO;
+import cz.muni.ics.kypo.training.adaptive.dto.training.TrainingPhaseDTO;
+import cz.muni.ics.kypo.training.adaptive.dto.training.TrainingPhaseUpdateDTO;
 import cz.muni.ics.kypo.training.adaptive.facade.TrainingPhaseFacade;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

src/main/java/cz/muni/ics/kypo/training/adaptive/controller/TasksController.java

 package cz.muni.ics.kypo.training.adaptive.controller;
 
-import cz.muni.ics.kypo.training.adaptive.dto.TaskDTO;
-import cz.muni.ics.kypo.training.adaptive.dto.TaskUpdateDTO;
+import cz.muni.ics.kypo.training.adaptive.dto.training.TaskDTO;
+import cz.muni.ics.kypo.training.adaptive.dto.training.TaskUpdateDTO;
 import cz.muni.ics.kypo.training.adaptive.service.TaskService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

src/main/java/cz/muni/ics/kypo/training/adaptive/dto/InfoPhaseDTO.java → src/main/java/cz/muni/ics/kypo/training/adaptive/dto/info/InfoPhaseDTO.java

-package cz.muni.ics.kypo.training.adaptive.dto;
+package cz.muni.ics.kypo.training.adaptive.dto.info;
+
+import cz.muni.ics.kypo.training.adaptive.dto.AbstractPhaseDTO;
 
 public class InfoPhaseDTO extends AbstractPhaseDTO {
 

src/main/java/cz/muni/ics/kypo/training/adaptive/dto/InfoPhaseUpdateDTO.java → src/main/java/cz/muni/ics/kypo/training/adaptive/dto/info/InfoPhaseUpdateDTO.java

-package cz.muni.ics.kypo.training.adaptive.dto;
+package cz.muni.ics.kypo.training.adaptive.dto.info;
 
 import io.swagger.annotations.ApiModelProperty;
 

src/main/java/cz/muni/ics/kypo/training/adaptive/dto/AbstractQuestionDTO.java → src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/AbstractQuestionDTO.java

-package cz.muni.ics.kypo.training.adaptive.dto;
+package cz.muni.ics.kypo.training.adaptive.dto.questionnaire;
 
 import cz.muni.ics.kypo.training.adaptive.enums.QuestionType;
 import io.swagger.annotations.ApiModelProperty;

src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionChoiceDTO.java → src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionChoiceDTO.java

-package cz.muni.ics.kypo.training.adaptive.dto;
+package cz.muni.ics.kypo.training.adaptive.dto.questionnaire;
 
 import io.swagger.annotations.ApiModelProperty;
 

src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionDTO.java → src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionDTO.java

-package cz.muni.ics.kypo.training.adaptive.dto;
+package cz.muni.ics.kypo.training.adaptive.dto.questionnaire;
 
 import io.swagger.annotations.ApiModelProperty;
 

src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionPhaseRelationDTO.java → src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionPhaseRelationDTO.java

-package cz.muni.ics.kypo.training.adaptive.dto;
+package cz.muni.ics.kypo.training.adaptive.dto.questionnaire;
 
 import io.swagger.annotations.ApiModelProperty;
 

src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionRequiredIdDTO.java → src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionRequiredIdDTO.java

-package cz.muni.ics.kypo.training.adaptive.dto;
+package cz.muni.ics.kypo.training.adaptive.dto.questionnaire;
 
 import io.swagger.annotations.ApiModelProperty;
 

src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionUpdateDTO.java → src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionUpdateDTO.java

-package cz.muni.ics.kypo.training.adaptive.dto;
+package cz.muni.ics.kypo.training.adaptive.dto.questionnaire;
 
 import cz.muni.ics.kypo.training.adaptive.enums.QuestionType;
 

src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionnairePhaseDTO.java → src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionnairePhaseDTO.java

-package cz.muni.ics.kypo.training.adaptive.dto;
+package cz.muni.ics.kypo.training.adaptive.dto.questionnaire;
 
+import cz.muni.ics.kypo.training.adaptive.dto.AbstractPhaseDTO;
 import cz.muni.ics.kypo.training.adaptive.enums.QuestionnaireType;
 
 import java.util.List;

src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionnaireUpdateDTO.java → src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionnaireUpdateDTO.java

-package cz.muni.ics.kypo.training.adaptive.dto;
+package cz.muni.ics.kypo.training.adaptive.dto.questionnaire;
 
 import io.swagger.annotations.ApiModelProperty;
 

src/main/java/cz/muni/ics/kypo/training/adaptive/dto/DecisionMatrixRowDTO.java → src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/DecisionMatrixRowDTO.java

-package cz.muni.ics.kypo.training.adaptive.dto;
+package cz.muni.ics.kypo.training.adaptive.dto.training;
 
 public class DecisionMatrixRowDTO {
     private long id;

src/main/java/cz/muni/ics/kypo/training/adaptive/dto/TaskDTO.java → src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/TaskDTO.java

-package cz.muni.ics.kypo.training.adaptive.dto;
+package cz.muni.ics.kypo.training.adaptive.dto.training;
 
 public class TaskDTO {
 

src/main/java/cz/muni/ics/kypo/training/adaptive/dto/TaskUpdateDTO.java → src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/TaskUpdateDTO.java

-package cz.muni.ics.kypo.training.adaptive.dto;
+package cz.muni.ics.kypo.training.adaptive.dto.training;
 
 import io.swagger.annotations.ApiModelProperty;
 

src/main/java/cz/muni/ics/kypo/training/adaptive/dto/TrainingPhaseDTO.java → src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/TrainingPhaseDTO.java

-package cz.muni.ics.kypo.training.adaptive.dto;
+package cz.muni.ics.kypo.training.adaptive.dto.training;
+
+import cz.muni.ics.kypo.training.adaptive.dto.AbstractPhaseDTO;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/cz/muni/ics/kypo/training/adaptive/dto/TrainingPhaseUpdateDTO.java → src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/TrainingPhaseUpdateDTO.java

-package cz.muni.ics.kypo.training.adaptive.dto;
+package cz.muni.ics.kypo.training.adaptive.dto.training;
 
 import io.swagger.annotations.ApiModelProperty;
 

src/main/java/cz/muni/ics/kypo/training/adaptive/facade/TrainingPhaseFacade.java

 package cz.muni.ics.kypo.training.adaptive.facade;
 
 import cz.muni.ics.kypo.training.adaptive.dto.AbstractPhaseDTO;
-import cz.muni.ics.kypo.training.adaptive.dto.InfoPhaseDTO;
-import cz.muni.ics.kypo.training.adaptive.dto.InfoPhaseUpdateDTO;
 import cz.muni.ics.kypo.training.adaptive.dto.PhaseCreateDTO;
-import cz.muni.ics.kypo.training.adaptive.dto.QuestionnairePhaseDTO;
-import cz.muni.ics.kypo.training.adaptive.dto.QuestionnaireUpdateDTO;
-import cz.muni.ics.kypo.training.adaptive.dto.TrainingPhaseDTO;
-import cz.muni.ics.kypo.training.adaptive.dto.TrainingPhaseUpdateDTO;
+import cz.muni.ics.kypo.training.adaptive.dto.info.InfoPhaseDTO;
+import cz.muni.ics.kypo.training.adaptive.dto.info.InfoPhaseUpdateDTO;
+import cz.muni.ics.kypo.training.adaptive.dto.questionnaire.QuestionnairePhaseDTO;
+import cz.muni.ics.kypo.training.adaptive.dto.questionnaire.QuestionnaireUpdateDTO;
+import cz.muni.ics.kypo.training.adaptive.dto.training.TrainingPhaseDTO;
+import cz.muni.ics.kypo.training.adaptive.dto.training.TrainingPhaseUpdateDTO;
 import cz.muni.ics.kypo.training.adaptive.enums.PhaseTypeCreate;
 import cz.muni.ics.kypo.training.adaptive.service.InfoPhaseService;
 import cz.muni.ics.kypo.training.adaptive.service.PhaseService;

src/main/java/cz/muni/ics/kypo/training/adaptive/mapper/BeanMapper.java

@@ -10,20 +10,20 @@ import cz.muni.ics.kypo.training.adaptive.domain.QuestionnairePhase;
 import cz.muni.ics.kypo.training.adaptive.domain.Task;
 import cz.muni.ics.kypo.training.adaptive.domain.TrainingPhase;
 import cz.muni.ics.kypo.training.adaptive.dto.AbstractPhaseDTO;
-import cz.muni.ics.kypo.training.adaptive.dto.DecisionMatrixRowDTO;
-import cz.muni.ics.kypo.training.adaptive.dto.InfoPhaseDTO;
-import cz.muni.ics.kypo.training.adaptive.dto.InfoPhaseUpdateDTO;
-import cz.muni.ics.kypo.training.adaptive.dto.QuestionChoiceDTO;
-import cz.muni.ics.kypo.training.adaptive.dto.QuestionDTO;
-import cz.muni.ics.kypo.training.adaptive.dto.QuestionPhaseRelationDTO;
-import cz.muni.ics.kypo.training.adaptive.dto.QuestionRequiredIdDTO;
-import cz.muni.ics.kypo.training.adaptive.dto.QuestionUpdateDTO;
-import cz.muni.ics.kypo.training.adaptive.dto.QuestionnairePhaseDTO;
-import cz.muni.ics.kypo.training.adaptive.dto.QuestionnaireUpdateDTO;
-import cz.muni.ics.kypo.training.adaptive.dto.TaskDTO;
-import cz.muni.ics.kypo.training.adaptive.dto.TaskUpdateDTO;
-import cz.muni.ics.kypo.training.adaptive.dto.TrainingPhaseDTO;
-import cz.muni.ics.kypo.training.adaptive.dto.TrainingPhaseUpdateDTO;
+import cz.muni.ics.kypo.training.adaptive.dto.info.InfoPhaseDTO;
+import cz.muni.ics.kypo.training.adaptive.dto.info.InfoPhaseUpdateDTO;
+import cz.muni.ics.kypo.training.adaptive.dto.questionnaire.QuestionChoiceDTO;
+import cz.muni.ics.kypo.training.adaptive.dto.questionnaire.QuestionDTO;
+import cz.muni.ics.kypo.training.adaptive.dto.questionnaire.QuestionPhaseRelationDTO;
+import cz.muni.ics.kypo.training.adaptive.dto.questionnaire.QuestionRequiredIdDTO;
+import cz.muni.ics.kypo.training.adaptive.dto.questionnaire.QuestionUpdateDTO;
+import cz.muni.ics.kypo.training.adaptive.dto.questionnaire.QuestionnairePhaseDTO;
+import cz.muni.ics.kypo.training.adaptive.dto.questionnaire.QuestionnaireUpdateDTO;
+import cz.muni.ics.kypo.training.adaptive.dto.training.DecisionMatrixRowDTO;
+import cz.muni.ics.kypo.training.adaptive.dto.training.TaskDTO;
+import cz.muni.ics.kypo.training.adaptive.dto.training.TaskUpdateDTO;
+import cz.muni.ics.kypo.training.adaptive.dto.training.TrainingPhaseDTO;
+import cz.muni.ics.kypo.training.adaptive.dto.training.TrainingPhaseUpdateDTO;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.factory.Mappers;

src/main/java/cz/muni/ics/kypo/training/adaptive/service/InfoPhaseService.java

 package cz.muni.ics.kypo.training.adaptive.service;
 
 import cz.muni.ics.kypo.training.adaptive.domain.InfoPhase;
-import cz.muni.ics.kypo.training.adaptive.dto.InfoPhaseDTO;
-import cz.muni.ics.kypo.training.adaptive.dto.InfoPhaseUpdateDTO;
+import cz.muni.ics.kypo.training.adaptive.dto.info.InfoPhaseDTO;
+import cz.muni.ics.kypo.training.adaptive.dto.info.InfoPhaseUpdateDTO;
 import cz.muni.ics.kypo.training.adaptive.mapper.BeanMapper;
 import cz.muni.ics.kypo.training.adaptive.repository.AbstractPhaseRepository;
 import cz.muni.ics.kypo.training.adaptive.repository.InfoPhaseRepository;