diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/controller/PhasesController.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/controller/PhasesController.java
index e985a33cab2ec510757e0644ce72aede0618b27c..c97d53f03b8dc048cfc82c68abfcb1bdd5e22cb0 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/controller/PhasesController.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/controller/PhasesController.java
@@ -1,13 +1,13 @@
 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;
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/controller/TasksController.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/controller/TasksController.java
index 54a13d87872de6c216dcbfe0b61183ea4fa31f06..139f6c503d660a51b0df52d2f6eb1cbba1113c13 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/controller/TasksController.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/controller/TasksController.java
@@ -1,7 +1,7 @@
 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;
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/InfoPhaseDTO.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/info/InfoPhaseDTO.java
similarity index 77%
rename from src/main/java/cz/muni/ics/kypo/training/adaptive/dto/InfoPhaseDTO.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/info/InfoPhaseDTO.java
index e7cbcdb831f07f0c2197ce8b91889ffce7b6b787..9acc05a382836d3b9cd174bef6c125ca98b7be82 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/InfoPhaseDTO.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/info/InfoPhaseDTO.java
@@ -1,4 +1,6 @@
-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 {
 
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/InfoPhaseUpdateDTO.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/info/InfoPhaseUpdateDTO.java
similarity index 95%
rename from src/main/java/cz/muni/ics/kypo/training/adaptive/dto/InfoPhaseUpdateDTO.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/info/InfoPhaseUpdateDTO.java
index 4fc4aa47466f43d7cb57b5e62091d449bfd357b9..96f30a521fac8cb7c32b851e2ef638eb12b74dcf 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/InfoPhaseUpdateDTO.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/info/InfoPhaseUpdateDTO.java
@@ -1,4 +1,4 @@
-package cz.muni.ics.kypo.training.adaptive.dto;
+package cz.muni.ics.kypo.training.adaptive.dto.info;
 
 import io.swagger.annotations.ApiModelProperty;
 
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/AbstractQuestionDTO.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/AbstractQuestionDTO.java
similarity index 96%
rename from src/main/java/cz/muni/ics/kypo/training/adaptive/dto/AbstractQuestionDTO.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/AbstractQuestionDTO.java
index 7b987b18ea014aa02c43cf7fa211bb473a1a593b..23aebe36b8fbd4658283aac8c5cb1b26fc362ecf 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/AbstractQuestionDTO.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/AbstractQuestionDTO.java
@@ -1,4 +1,4 @@
-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;
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionChoiceDTO.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionChoiceDTO.java
similarity index 95%
rename from src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionChoiceDTO.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionChoiceDTO.java
index c4999337a8e7c41a11ece192973443c4fbe00930..a9b2326b97b4a694932e138a3a0dfd247e44b8af 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionChoiceDTO.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionChoiceDTO.java
@@ -1,4 +1,4 @@
-package cz.muni.ics.kypo.training.adaptive.dto;
+package cz.muni.ics.kypo.training.adaptive.dto.questionnaire;
 
 import io.swagger.annotations.ApiModelProperty;
 
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionDTO.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionDTO.java
similarity index 85%
rename from src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionDTO.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionDTO.java
index 0b02db867a5798a01769363acf00f25ef2f3a291..89827a0364daaed94fe0206fec5126be1e755aa3 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionDTO.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionDTO.java
@@ -1,4 +1,4 @@
-package cz.muni.ics.kypo.training.adaptive.dto;
+package cz.muni.ics.kypo.training.adaptive.dto.questionnaire;
 
 import io.swagger.annotations.ApiModelProperty;
 
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionPhaseRelationDTO.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionPhaseRelationDTO.java
similarity index 96%
rename from src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionPhaseRelationDTO.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionPhaseRelationDTO.java
index 5d8ff1c53d8a93357be99d18b56e2bcad8f8a7f5..a8f647c2984f9b94e397b8a7db0d5fc3335b9c1f 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionPhaseRelationDTO.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionPhaseRelationDTO.java
@@ -1,4 +1,4 @@
-package cz.muni.ics.kypo.training.adaptive.dto;
+package cz.muni.ics.kypo.training.adaptive.dto.questionnaire;
 
 import io.swagger.annotations.ApiModelProperty;
 
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionRequiredIdDTO.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionRequiredIdDTO.java
similarity index 88%
rename from src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionRequiredIdDTO.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionRequiredIdDTO.java
index 23c0af41fa23a3cda713fe73aabc9fce340ca1ea..2f156eeb13b6ac95870c04897bfb12e5a467bc53 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionRequiredIdDTO.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionRequiredIdDTO.java
@@ -1,4 +1,4 @@
-package cz.muni.ics.kypo.training.adaptive.dto;
+package cz.muni.ics.kypo.training.adaptive.dto.questionnaire;
 
 import io.swagger.annotations.ApiModelProperty;
 
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionUpdateDTO.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionUpdateDTO.java
similarity index 96%
rename from src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionUpdateDTO.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionUpdateDTO.java
index dded8ef5c0aee6701b7402d12f587c9c896f7fb5..a535715bbe1045bbd126228209edd2c47180fe18 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionUpdateDTO.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionUpdateDTO.java
@@ -1,4 +1,4 @@
-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;
 
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionnairePhaseDTO.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionnairePhaseDTO.java
similarity index 88%
rename from src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionnairePhaseDTO.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionnairePhaseDTO.java
index 2446e6664611febee3102162cd82216c1043f238..9d41ff5a9e4d8cc35aff2a6f24a3dbb656487b55 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionnairePhaseDTO.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionnairePhaseDTO.java
@@ -1,5 +1,6 @@
-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;
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionnaireUpdateDTO.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionnaireUpdateDTO.java
similarity index 96%
rename from src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionnaireUpdateDTO.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionnaireUpdateDTO.java
index 3d4a645b6db2d314d84d914bcf0bf64e7ac255ad..6d7c6c5509e9028117f8d2b100cd01070df12d60 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionnaireUpdateDTO.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionnaireUpdateDTO.java
@@ -1,4 +1,4 @@
-package cz.muni.ics.kypo.training.adaptive.dto;
+package cz.muni.ics.kypo.training.adaptive.dto.questionnaire;
 
 import io.swagger.annotations.ApiModelProperty;
 
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/DecisionMatrixRowDTO.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/DecisionMatrixRowDTO.java
similarity index 97%
rename from src/main/java/cz/muni/ics/kypo/training/adaptive/dto/DecisionMatrixRowDTO.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/DecisionMatrixRowDTO.java
index 317aa1a06f7ed7ba541cf82f148ff18e3264be10..4c907a2b72f4624f88426f6ba1d24643b4068467 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/DecisionMatrixRowDTO.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/DecisionMatrixRowDTO.java
@@ -1,4 +1,4 @@
-package cz.muni.ics.kypo.training.adaptive.dto;
+package cz.muni.ics.kypo.training.adaptive.dto.training;
 
 public class DecisionMatrixRowDTO {
     private long id;
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/TaskDTO.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/TaskDTO.java
similarity index 96%
rename from src/main/java/cz/muni/ics/kypo/training/adaptive/dto/TaskDTO.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/TaskDTO.java
index 52575f49c15b5a34c4109c937da640d753ca35bb..3559cc264a68809241510f31c66bd594150e1873 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/TaskDTO.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/TaskDTO.java
@@ -1,4 +1,4 @@
-package cz.muni.ics.kypo.training.adaptive.dto;
+package cz.muni.ics.kypo.training.adaptive.dto.training;
 
 public class TaskDTO {
 
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/TaskUpdateDTO.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/TaskUpdateDTO.java
similarity index 97%
rename from src/main/java/cz/muni/ics/kypo/training/adaptive/dto/TaskUpdateDTO.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/TaskUpdateDTO.java
index cdaf26f849e5db8765bfa8c6431738407412b0ab..5b1e8d532eda591befcf7b8152ed84fef690d0d2 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/TaskUpdateDTO.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/TaskUpdateDTO.java
@@ -1,4 +1,4 @@
-package cz.muni.ics.kypo.training.adaptive.dto;
+package cz.muni.ics.kypo.training.adaptive.dto.training;
 
 import io.swagger.annotations.ApiModelProperty;
 
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/TrainingPhaseDTO.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/TrainingPhaseDTO.java
similarity index 91%
rename from src/main/java/cz/muni/ics/kypo/training/adaptive/dto/TrainingPhaseDTO.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/TrainingPhaseDTO.java
index d0a2c356c7c6a1c4c2081fa692b607ed992b9531..5f5507126763b95d3fbb448c007bb05bbf174a5f 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/TrainingPhaseDTO.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/TrainingPhaseDTO.java
@@ -1,4 +1,6 @@
-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;
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/TrainingPhaseUpdateDTO.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/TrainingPhaseUpdateDTO.java
similarity index 97%
rename from src/main/java/cz/muni/ics/kypo/training/adaptive/dto/TrainingPhaseUpdateDTO.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/TrainingPhaseUpdateDTO.java
index 96d2e208f5d41ba9a655dfd2a2a956418d6ce650..f7f051f52e73d5e79b7bffb0653c6cf8b652ae36 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/TrainingPhaseUpdateDTO.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/TrainingPhaseUpdateDTO.java
@@ -1,4 +1,4 @@
-package cz.muni.ics.kypo.training.adaptive.dto;
+package cz.muni.ics.kypo.training.adaptive.dto.training;
 
 import io.swagger.annotations.ApiModelProperty;
 
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/facade/TrainingPhaseFacade.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/facade/TrainingPhaseFacade.java
index 2f63d2284480434ca7051a2d09dfb85cb78527da..596f32efcaa54c3a490fc26ea55a1d6b91a9af1f 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/facade/TrainingPhaseFacade.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/facade/TrainingPhaseFacade.java
@@ -1,13 +1,13 @@
 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;
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/mapper/BeanMapper.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/mapper/BeanMapper.java
index d982a560f7d88a9af766a5a53993620ded885490..861e6022770bed61c9232411b9d8d284e101c8f8 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/mapper/BeanMapper.java
+++ b/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;
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/service/InfoPhaseService.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/InfoPhaseService.java
index 4d61270c57bf77001fdb24a274b043f6b3593d9e..5d109ab38897407f15c2fbc93666a8305bc1cafe 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/service/InfoPhaseService.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/InfoPhaseService.java
@@ -1,8 +1,8 @@
 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;
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/service/QuestionnairePhaseService.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/QuestionnairePhaseService.java
index 909f82bf72e272b3fa2b5f8e99be096b4669fa2f..0eb15741f07ee60bcf216b242471849aeb8764e3 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/service/QuestionnairePhaseService.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/QuestionnairePhaseService.java
@@ -5,9 +5,9 @@ import cz.muni.ics.kypo.training.adaptive.domain.QuestionPhaseRelation;
 import cz.muni.ics.kypo.training.adaptive.domain.QuestionnairePhase;
 import cz.muni.ics.kypo.training.adaptive.domain.TrainingPhase;
 import cz.muni.ics.kypo.training.adaptive.dto.PhaseCreateDTO;
-import cz.muni.ics.kypo.training.adaptive.dto.QuestionPhaseRelationDTO;
-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.questionnaire.QuestionPhaseRelationDTO;
+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.enums.PhaseTypeCreate;
 import cz.muni.ics.kypo.training.adaptive.enums.QuestionnaireType;
 import cz.muni.ics.kypo.training.adaptive.mapper.BeanMapper;
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/service/TaskService.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/TaskService.java
index 42f47ec9a82103d8b3d0851f4fc6a460d34e98b5..3173993e3e21ba205097fa45888f2438dc91c142 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/service/TaskService.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/TaskService.java
@@ -2,8 +2,8 @@ package cz.muni.ics.kypo.training.adaptive.service;
 
 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.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.mapper.BeanMapper;
 import cz.muni.ics.kypo.training.adaptive.repository.TaskRepository;
 import cz.muni.ics.kypo.training.adaptive.repository.TrainingPhaseRepository;
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/service/TrainingPhaseService.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/TrainingPhaseService.java
index 414600ea0f23a927383578f858c5785e555f5cdd..9cceba82bbfaa931862e460c5642ea52952e5f68 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/service/TrainingPhaseService.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/TrainingPhaseService.java
@@ -2,8 +2,8 @@ package cz.muni.ics.kypo.training.adaptive.service;
 
 import cz.muni.ics.kypo.training.adaptive.domain.DecisionMatrixRow;
 import cz.muni.ics.kypo.training.adaptive.domain.TrainingPhase;
-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.training.TrainingPhaseDTO;
+import cz.muni.ics.kypo.training.adaptive.dto.training.TrainingPhaseUpdateDTO;
 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.TrainingPhaseRepository;