diff --git a/src/main/java/com/example/demo/DemoApplication.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/DemoApplication.java
similarity index 86%
rename from src/main/java/com/example/demo/DemoApplication.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/DemoApplication.java
index 2a9bdbe0de755296c1f4a6216bd8ba9a38e365cc..f27e2306569feea5da18832de5bbc9f883e62d67 100644
--- a/src/main/java/com/example/demo/DemoApplication.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/DemoApplication.java
@@ -1,4 +1,4 @@
-package com.example.demo;
+package cz.muni.ics.kypo.training.adaptive;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/src/main/java/com/example/demo/config/SwaggerConfig.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/config/SwaggerConfig.java
similarity index 93%
rename from src/main/java/com/example/demo/config/SwaggerConfig.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/config/SwaggerConfig.java
index f9d6e88c7c0be762f1ec797bde4c956012c62d76..f0eadc5afe4df9e2da40826babb009910b2e9be4 100644
--- a/src/main/java/com/example/demo/config/SwaggerConfig.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/config/SwaggerConfig.java
@@ -1,4 +1,4 @@
-package com.example.demo.config;
+package cz.muni.ics.kypo.training.adaptive.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/src/main/java/com/example/demo/controller/PhasesController.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/controller/PhasesController.java
similarity index 93%
rename from src/main/java/com/example/demo/controller/PhasesController.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/controller/PhasesController.java
index f59af521bca3006588040773ea49587171747098..e75d1d6abf635ca62721d8f43601a9ff05766c63 100644
--- a/src/main/java/com/example/demo/controller/PhasesController.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/controller/PhasesController.java
@@ -1,14 +1,14 @@
-package com.example.demo.controller;
-
-import com.example.demo.dto.AbstractPhaseDto;
-import com.example.demo.dto.InfoPhaseDto;
-import com.example.demo.dto.InfoPhaseUpdateDto;
-import com.example.demo.dto.PhaseCreateDTO;
-import com.example.demo.dto.QuestionnairePhaseDto;
-import com.example.demo.dto.TrainingPhaseDto;
-import com.example.demo.dto.TrainingPhaseUpdateDto;
-import com.example.demo.dto.QuestionnaireUpdateDto;
-import com.example.demo.facade.TrainingPhaseFacade;
+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.facade.TrainingPhaseFacade;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
diff --git a/src/main/java/com/example/demo/controller/TasksController.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/controller/TasksController.java
similarity index 97%
rename from src/main/java/com/example/demo/controller/TasksController.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/controller/TasksController.java
index 30de910aa3eb43a19549be0e705ed07f0b9ffdb5..0aa323a61c8be8a6679b082b46a392bd5272fa8e 100644
--- a/src/main/java/com/example/demo/controller/TasksController.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/controller/TasksController.java
@@ -1,8 +1,8 @@
-package com.example.demo.controller;
+package cz.muni.ics.kypo.training.adaptive.controller;
 
-import com.example.demo.dto.TaskDto;
-import com.example.demo.dto.TaskUpdateDto;
-import com.example.demo.service.TaskService;
+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.service.TaskService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
diff --git a/src/main/java/com/example/demo/domain/AbstractPhase.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/domain/AbstractPhase.java
similarity index 96%
rename from src/main/java/com/example/demo/domain/AbstractPhase.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/domain/AbstractPhase.java
index e194f92e5c0884cc81b9ddf5374cd98666bf4b93..d6d156c9c3b84873fd45ae4e7bfb27f8b6247c62 100644
--- a/src/main/java/com/example/demo/domain/AbstractPhase.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/domain/AbstractPhase.java
@@ -1,4 +1,4 @@
-package com.example.demo.domain;
+package cz.muni.ics.kypo.training.adaptive.domain;
 
 
 import javax.persistence.Column;
diff --git a/src/main/java/com/example/demo/domain/DecisionMatrixRow.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/domain/DecisionMatrixRow.java
similarity index 97%
rename from src/main/java/com/example/demo/domain/DecisionMatrixRow.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/domain/DecisionMatrixRow.java
index f45091451877013830ef16da0826be6db4b4a3de..94e61acfb13d6531c4d1ac42ecf6ffdea3f00546 100644
--- a/src/main/java/com/example/demo/domain/DecisionMatrixRow.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/domain/DecisionMatrixRow.java
@@ -1,4 +1,4 @@
-package com.example.demo.domain;
+package cz.muni.ics.kypo.training.adaptive.domain;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
diff --git a/src/main/java/com/example/demo/domain/InfoPhase.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/domain/InfoPhase.java
similarity index 89%
rename from src/main/java/com/example/demo/domain/InfoPhase.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/domain/InfoPhase.java
index 82b0a8f7bd8aebaa82ac2304d7f8457dd7ba3357..e0f0b83fdae7a1d81fb455d51796c4c99e9f94af 100644
--- a/src/main/java/com/example/demo/domain/InfoPhase.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/domain/InfoPhase.java
@@ -1,4 +1,4 @@
-package com.example.demo.domain;
+package cz.muni.ics.kypo.training.adaptive.domain;
 
 import javax.persistence.Entity;
 
diff --git a/src/main/java/com/example/demo/domain/Question.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/domain/Question.java
similarity index 95%
rename from src/main/java/com/example/demo/domain/Question.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/domain/Question.java
index 0a87e136cdc630523ee8e37ab90e18afda2e90e7..f0432e49724f498fb5e8c368416d8d8627dc0f8f 100644
--- a/src/main/java/com/example/demo/domain/Question.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/domain/Question.java
@@ -1,6 +1,6 @@
-package com.example.demo.domain;
+package cz.muni.ics.kypo.training.adaptive.domain;
 
-import com.example.demo.enums.QuestionType;
+import cz.muni.ics.kypo.training.adaptive.enums.QuestionType;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
diff --git a/src/main/java/com/example/demo/domain/QuestionChoice.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/domain/QuestionChoice.java
similarity index 95%
rename from src/main/java/com/example/demo/domain/QuestionChoice.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/domain/QuestionChoice.java
index b1bafaa5bee671a8ee452efea7063ba78931dc33..110fc978710e1e7dacd0d6eeb350579176661d29 100644
--- a/src/main/java/com/example/demo/domain/QuestionChoice.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/domain/QuestionChoice.java
@@ -1,4 +1,4 @@
-package com.example.demo.domain;
+package cz.muni.ics.kypo.training.adaptive.domain;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
diff --git a/src/main/java/com/example/demo/domain/QuestionPhaseRelation.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/domain/QuestionPhaseRelation.java
similarity index 97%
rename from src/main/java/com/example/demo/domain/QuestionPhaseRelation.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/domain/QuestionPhaseRelation.java
index db6e6ae10abe66cf54f34f8f6bbd6198a845d12b..53f209291d08afed7b96124864aa4ff167b0b5ba 100644
--- a/src/main/java/com/example/demo/domain/QuestionPhaseRelation.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/domain/QuestionPhaseRelation.java
@@ -1,4 +1,4 @@
-package com.example.demo.domain;
+package cz.muni.ics.kypo.training.adaptive.domain;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
diff --git a/src/main/java/com/example/demo/domain/QuestionnairePhase.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/domain/QuestionnairePhase.java
similarity index 92%
rename from src/main/java/com/example/demo/domain/QuestionnairePhase.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/domain/QuestionnairePhase.java
index 1bced3384c384bbfd8ee093a2dce31c6dc1db681..7b199398f3c5af5451f0de02bdeebb881a53c099 100644
--- a/src/main/java/com/example/demo/domain/QuestionnairePhase.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/domain/QuestionnairePhase.java
@@ -1,6 +1,6 @@
-package com.example.demo.domain;
+package cz.muni.ics.kypo.training.adaptive.domain;
 
-import com.example.demo.enums.QuestionnaireType;
+import cz.muni.ics.kypo.training.adaptive.enums.QuestionnaireType;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
diff --git a/src/main/java/com/example/demo/domain/Task.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/domain/Task.java
similarity index 97%
rename from src/main/java/com/example/demo/domain/Task.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/domain/Task.java
index 23bf2d225c6aa9b2ff20b80e9674a56ba45ba22f..ceb59992fe33a76a0359723d7cd6c2cc6c81a71e 100644
--- a/src/main/java/com/example/demo/domain/Task.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/domain/Task.java
@@ -1,4 +1,4 @@
-package com.example.demo.domain;
+package cz.muni.ics.kypo.training.adaptive.domain;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
diff --git a/src/main/java/com/example/demo/domain/TrainingPhase.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/domain/TrainingPhase.java
similarity index 97%
rename from src/main/java/com/example/demo/domain/TrainingPhase.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/domain/TrainingPhase.java
index 9e91ba8cc64a588b3c8048ba68a37152ba39044b..550188ef2f02e223f976fca3e3b77271937720f8 100644
--- a/src/main/java/com/example/demo/domain/TrainingPhase.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/domain/TrainingPhase.java
@@ -1,4 +1,4 @@
-package com.example.demo.domain;
+package cz.muni.ics.kypo.training.adaptive.domain;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
diff --git a/src/main/java/com/example/demo/dto/AbstractPhaseDto.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/AbstractPhaseDto.java
similarity index 90%
rename from src/main/java/com/example/demo/dto/AbstractPhaseDto.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/AbstractPhaseDto.java
index c15487a28af0e7ba9ed9491beaa90137b2834d45..8f08d5ab5857bccf2ddf020a47396931683352ff 100644
--- a/src/main/java/com/example/demo/dto/AbstractPhaseDto.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/AbstractPhaseDto.java
@@ -1,6 +1,6 @@
-package com.example.demo.dto;
+package cz.muni.ics.kypo.training.adaptive.dto;
 
-import com.example.demo.enums.PhaseType;
+import cz.muni.ics.kypo.training.adaptive.enums.PhaseType;
 
 import java.io.Serializable;
 
diff --git a/src/main/java/com/example/demo/dto/AbstractQuestionDto.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/AbstractQuestionDto.java
similarity index 93%
rename from src/main/java/com/example/demo/dto/AbstractQuestionDto.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/AbstractQuestionDto.java
index 32bb7b4320a8b0a30630d717ef6cfd6f9b2060c3..e09d4461181aabfbdfe4e337d10bbbae5f870106 100644
--- a/src/main/java/com/example/demo/dto/AbstractQuestionDto.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/AbstractQuestionDto.java
@@ -1,6 +1,6 @@
-package com.example.demo.dto;
+package cz.muni.ics.kypo.training.adaptive.dto;
 
-import com.example.demo.enums.QuestionType;
+import cz.muni.ics.kypo.training.adaptive.enums.QuestionType;
 import io.swagger.annotations.ApiModelProperty;
 
 import javax.validation.constraints.NotEmpty;
diff --git a/src/main/java/com/example/demo/dto/DecisionMatrixRowDto.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/DecisionMatrixRowDto.java
similarity index 96%
rename from src/main/java/com/example/demo/dto/DecisionMatrixRowDto.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/DecisionMatrixRowDto.java
index 81dc0891522109727f2726164298b0a20d816e58..0440e904cbf911a8b4d54375bbe16cc42601151c 100644
--- a/src/main/java/com/example/demo/dto/DecisionMatrixRowDto.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/DecisionMatrixRowDto.java
@@ -1,4 +1,4 @@
-package com.example.demo.dto;
+package cz.muni.ics.kypo.training.adaptive.dto;
 
 public class DecisionMatrixRowDto {
     private long id;
diff --git a/src/main/java/com/example/demo/dto/InfoPhaseDto.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/InfoPhaseDto.java
similarity index 90%
rename from src/main/java/com/example/demo/dto/InfoPhaseDto.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/InfoPhaseDto.java
index e7f8ceb15dc93fe4f79e7653a133056f993a11aa..6e62117c65b6b6bd8e4372e5e45afe500d106ffc 100644
--- a/src/main/java/com/example/demo/dto/InfoPhaseDto.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/InfoPhaseDto.java
@@ -1,4 +1,4 @@
-package com.example.demo.dto;
+package cz.muni.ics.kypo.training.adaptive.dto;
 
 import java.io.Serializable;
 
diff --git a/src/main/java/com/example/demo/dto/InfoPhaseUpdateDto.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/InfoPhaseUpdateDto.java
similarity index 95%
rename from src/main/java/com/example/demo/dto/InfoPhaseUpdateDto.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/InfoPhaseUpdateDto.java
index add16336e4fab01b68979cbe5a12987d29224c26..445cba25263a59b80a4dc45d07877395b93756fb 100644
--- a/src/main/java/com/example/demo/dto/InfoPhaseUpdateDto.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/InfoPhaseUpdateDto.java
@@ -1,4 +1,4 @@
-package com.example.demo.dto;
+package cz.muni.ics.kypo.training.adaptive.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 
diff --git a/src/main/java/com/example/demo/dto/PhaseCreateDTO.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/PhaseCreateDTO.java
similarity index 86%
rename from src/main/java/com/example/demo/dto/PhaseCreateDTO.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/PhaseCreateDTO.java
index 13330b24622261e387d319743677089999537258..9f7a29aa084fb3950ed6aaca9dc5bcb3ccd43b5c 100644
--- a/src/main/java/com/example/demo/dto/PhaseCreateDTO.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/PhaseCreateDTO.java
@@ -1,6 +1,6 @@
-package com.example.demo.dto;
+package cz.muni.ics.kypo.training.adaptive.dto;
 
-import com.example.demo.enums.PhaseType;
+import cz.muni.ics.kypo.training.adaptive.enums.PhaseType;
 import io.swagger.annotations.ApiModelProperty;
 
 import javax.validation.constraints.NotNull;
diff --git a/src/main/java/com/example/demo/dto/QuestionChoiceDto.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionChoiceDto.java
similarity index 96%
rename from src/main/java/com/example/demo/dto/QuestionChoiceDto.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionChoiceDto.java
index da686f75d8fd76bc1e260d69ecd1641e101bda22..2ebae1d403f32acee84845403c1cbc6b4e574ce2 100644
--- a/src/main/java/com/example/demo/dto/QuestionChoiceDto.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionChoiceDto.java
@@ -1,4 +1,4 @@
-package com.example.demo.dto;
+package cz.muni.ics.kypo.training.adaptive.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 
diff --git a/src/main/java/com/example/demo/dto/QuestionDto.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionDto.java
similarity index 89%
rename from src/main/java/com/example/demo/dto/QuestionDto.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionDto.java
index 2cbc9390b9a3afce01983c407b9a1339898a76b8..b221016bcc322c2abcd541a142522305cb47e45e 100644
--- a/src/main/java/com/example/demo/dto/QuestionDto.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionDto.java
@@ -1,4 +1,4 @@
-package com.example.demo.dto;
+package cz.muni.ics.kypo.training.adaptive.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 
diff --git a/src/main/java/com/example/demo/dto/QuestionPhaseRelationDto.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionPhaseRelationDto.java
similarity index 97%
rename from src/main/java/com/example/demo/dto/QuestionPhaseRelationDto.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionPhaseRelationDto.java
index a409ff19f98e8725d2e26fdb7fe3280c3679291e..885aadce7d9c861e46bcc58cdb5f343c40e11974 100644
--- a/src/main/java/com/example/demo/dto/QuestionPhaseRelationDto.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionPhaseRelationDto.java
@@ -1,4 +1,4 @@
-package com.example.demo.dto;
+package cz.muni.ics.kypo.training.adaptive.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 
diff --git a/src/main/java/com/example/demo/dto/QuestionRequiredIdDto.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionRequiredIdDto.java
similarity index 90%
rename from src/main/java/com/example/demo/dto/QuestionRequiredIdDto.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionRequiredIdDto.java
index dc14202927ea50291fb520a271e5859cab2f66ec..249ad80f670c1455e4b4391e0526ece1a0d1130d 100644
--- a/src/main/java/com/example/demo/dto/QuestionRequiredIdDto.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionRequiredIdDto.java
@@ -1,4 +1,4 @@
-package com.example.demo.dto;
+package cz.muni.ics.kypo.training.adaptive.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 
diff --git a/src/main/java/com/example/demo/dto/QuestionUpdateDto.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionUpdateDto.java
similarity index 94%
rename from src/main/java/com/example/demo/dto/QuestionUpdateDto.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionUpdateDto.java
index bc66c10a8ddeae9ed4c10e1be3fbced227b8609c..4a0f96999208958778e526cfe084b5008921f5b1 100644
--- a/src/main/java/com/example/demo/dto/QuestionUpdateDto.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionUpdateDto.java
@@ -1,6 +1,6 @@
-package com.example.demo.dto;
+package cz.muni.ics.kypo.training.adaptive.dto;
 
-import com.example.demo.enums.QuestionType;
+import cz.muni.ics.kypo.training.adaptive.enums.QuestionType;
 
 import java.util.List;
 
diff --git a/src/main/java/com/example/demo/dto/QuestionnairePhaseDto.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionnairePhaseDto.java
similarity index 88%
rename from src/main/java/com/example/demo/dto/QuestionnairePhaseDto.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionnairePhaseDto.java
index bb773bde62754911a9bf19c7858594adf0aa32bc..db1e717de51b7e244eb4cde6f7cc458d37a67689 100644
--- a/src/main/java/com/example/demo/dto/QuestionnairePhaseDto.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionnairePhaseDto.java
@@ -1,6 +1,6 @@
-package com.example.demo.dto;
+package cz.muni.ics.kypo.training.adaptive.dto;
 
-import com.example.demo.enums.QuestionnaireType;
+import cz.muni.ics.kypo.training.adaptive.enums.QuestionnaireType;
 
 import java.util.List;
 
diff --git a/src/main/java/com/example/demo/dto/QuestionnaireUpdateDto.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionnaireUpdateDto.java
similarity index 94%
rename from src/main/java/com/example/demo/dto/QuestionnaireUpdateDto.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionnaireUpdateDto.java
index bcf552d16779aa5a176eadf791fe11b2b814b753..45adb56449f892e186246f8ec8b3ee82a1f916dd 100644
--- a/src/main/java/com/example/demo/dto/QuestionnaireUpdateDto.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionnaireUpdateDto.java
@@ -1,6 +1,6 @@
-package com.example.demo.dto;
+package cz.muni.ics.kypo.training.adaptive.dto;
 
-import com.example.demo.enums.QuestionnaireType;
+import cz.muni.ics.kypo.training.adaptive.enums.QuestionnaireType;
 import io.swagger.annotations.ApiModelProperty;
 
 import javax.validation.Valid;
diff --git a/src/main/java/com/example/demo/dto/TaskCreateDto.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/TaskCreateDto.java
similarity index 77%
rename from src/main/java/com/example/demo/dto/TaskCreateDto.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/TaskCreateDto.java
index 5b073c01bcfd36125fd6d4e5a0d8fe842144790c..dea94543f6932fc43a2cb38bb6b1a0a435a8c502 100644
--- a/src/main/java/com/example/demo/dto/TaskCreateDto.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/TaskCreateDto.java
@@ -1,4 +1,4 @@
-package com.example.demo.dto;
+package cz.muni.ics.kypo.training.adaptive.dto;
 
 public class TaskCreateDto extends TaskUpdateDto {
 
diff --git a/src/main/java/com/example/demo/dto/TaskDto.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/TaskDto.java
similarity index 97%
rename from src/main/java/com/example/demo/dto/TaskDto.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/TaskDto.java
index 863bdf3062b6a9cc6e5a105c764bf16c82d615dd..f6447b07ffd888f24a39f2655ff7e4fd0200abdf 100644
--- a/src/main/java/com/example/demo/dto/TaskDto.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/TaskDto.java
@@ -1,4 +1,4 @@
-package com.example.demo.dto;
+package cz.muni.ics.kypo.training.adaptive.dto;
 
 import java.io.Serializable;
 
diff --git a/src/main/java/com/example/demo/dto/TaskUpdateDto.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/TaskUpdateDto.java
similarity index 98%
rename from src/main/java/com/example/demo/dto/TaskUpdateDto.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/TaskUpdateDto.java
index 94690d578f257efadb8c37d58f39c5c386927cc0..3813676edd094bb752019c5fa30094f2ed6334dc 100644
--- a/src/main/java/com/example/demo/dto/TaskUpdateDto.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/TaskUpdateDto.java
@@ -1,4 +1,4 @@
-package com.example.demo.dto;
+package cz.muni.ics.kypo.training.adaptive.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 
diff --git a/src/main/java/com/example/demo/dto/TrainingPhaseDto.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/TrainingPhaseDto.java
similarity index 96%
rename from src/main/java/com/example/demo/dto/TrainingPhaseDto.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/TrainingPhaseDto.java
index c81bcf7225bb7b73f47a4aa6c682d4fd65860694..3a3933d035506fddcc9f4fe7e5a8003f28bab86b 100644
--- a/src/main/java/com/example/demo/dto/TrainingPhaseDto.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/TrainingPhaseDto.java
@@ -1,4 +1,4 @@
-package com.example.demo.dto;
+package cz.muni.ics.kypo.training.adaptive.dto;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/com/example/demo/dto/TrainingPhaseUpdateDto.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/TrainingPhaseUpdateDto.java
similarity index 97%
rename from src/main/java/com/example/demo/dto/TrainingPhaseUpdateDto.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/TrainingPhaseUpdateDto.java
index acc72518843da9f68c12e35a73b2f958a119cc0f..9347cc84283e7102a8a58836b544164381977749 100644
--- a/src/main/java/com/example/demo/dto/TrainingPhaseUpdateDto.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/TrainingPhaseUpdateDto.java
@@ -1,4 +1,4 @@
-package com.example.demo.dto;
+package cz.muni.ics.kypo.training.adaptive.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 
diff --git a/src/main/java/com/example/demo/enums/PhaseType.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/enums/PhaseType.java
similarity index 67%
rename from src/main/java/com/example/demo/enums/PhaseType.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/enums/PhaseType.java
index 03298dbd54f4ab10a3bd1b39b568df5b829bbeef..45e243a571e9aff47d901b7504c2a65009b9c59b 100644
--- a/src/main/java/com/example/demo/enums/PhaseType.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/enums/PhaseType.java
@@ -1,4 +1,4 @@
-package com.example.demo.enums;
+package cz.muni.ics.kypo.training.adaptive.enums;
 
 public enum PhaseType {
     QUESTIONNAIRE_ADAPTIVE,
diff --git a/src/main/java/com/example/demo/enums/QuestionType.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/enums/QuestionType.java
similarity index 52%
rename from src/main/java/com/example/demo/enums/QuestionType.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/enums/QuestionType.java
index e0d127eea67c49accb785645cf2fd84335a809da..63c10dad66660852a3399a733d622990772ffbf9 100644
--- a/src/main/java/com/example/demo/enums/QuestionType.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/enums/QuestionType.java
@@ -1,4 +1,4 @@
-package com.example.demo.enums;
+package cz.muni.ics.kypo.training.adaptive.enums;
 
 public enum QuestionType {
     FFQ,
diff --git a/src/main/java/com/example/demo/enums/QuestionnaireType.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/enums/QuestionnaireType.java
similarity index 54%
rename from src/main/java/com/example/demo/enums/QuestionnaireType.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/enums/QuestionnaireType.java
index c7b23f385004694a001964edd08152fe5ccc9208..a4d365fba9e76404ad5e272d6d015eb3694af404 100644
--- a/src/main/java/com/example/demo/enums/QuestionnaireType.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/enums/QuestionnaireType.java
@@ -1,4 +1,4 @@
-package com.example.demo.enums;
+package cz.muni.ics.kypo.training.adaptive.enums;
 
 public enum QuestionnaireType {
     ADAPTIVE,
diff --git a/src/main/java/com/example/demo/facade/TrainingPhaseFacade.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/facade/TrainingPhaseFacade.java
similarity index 76%
rename from src/main/java/com/example/demo/facade/TrainingPhaseFacade.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/facade/TrainingPhaseFacade.java
index d01ee5a4afac58d92f3861a718fea5286e1c00f4..d4adf5e9f7b0bfc1eca64a12199e52f12f9cf902 100644
--- a/src/main/java/com/example/demo/facade/TrainingPhaseFacade.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/facade/TrainingPhaseFacade.java
@@ -1,19 +1,19 @@
-package com.example.demo.facade;
-
-import com.example.demo.dto.AbstractPhaseDto;
-import com.example.demo.dto.InfoPhaseDto;
-import com.example.demo.dto.InfoPhaseUpdateDto;
-import com.example.demo.dto.PhaseCreateDTO;
-import com.example.demo.dto.QuestionnairePhaseDto;
-import com.example.demo.dto.QuestionnaireUpdateDto;
-import com.example.demo.dto.TrainingPhaseDto;
-import com.example.demo.dto.TrainingPhaseUpdateDto;
-import com.example.demo.enums.PhaseType;
-import com.example.demo.enums.QuestionnaireType;
-import com.example.demo.service.InfoPhaseService;
-import com.example.demo.service.PhaseService;
-import com.example.demo.service.QuestionnairePhaseService;
-import com.example.demo.service.TrainingPhaseService;
+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.enums.PhaseType;
+import cz.muni.ics.kypo.training.adaptive.enums.QuestionnaireType;
+import cz.muni.ics.kypo.training.adaptive.service.InfoPhaseService;
+import cz.muni.ics.kypo.training.adaptive.service.PhaseService;
+import cz.muni.ics.kypo.training.adaptive.service.QuestionnairePhaseService;
+import cz.muni.ics.kypo.training.adaptive.service.TrainingPhaseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/src/main/java/com/example/demo/mapper/BeanMapper.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/mapper/BeanMapper.java
similarity index 65%
rename from src/main/java/com/example/demo/mapper/BeanMapper.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/mapper/BeanMapper.java
index e1617c69d1e2e7f56a7cbd565e132c464308443b..5e5a4b956764e8ff278bffb21e40cd56538ce5e6 100644
--- a/src/main/java/com/example/demo/mapper/BeanMapper.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/mapper/BeanMapper.java
@@ -1,30 +1,30 @@
-package com.example.demo.mapper;
-
-import com.example.demo.domain.AbstractPhase;
-import com.example.demo.domain.DecisionMatrixRow;
-import com.example.demo.domain.InfoPhase;
-import com.example.demo.domain.Question;
-import com.example.demo.domain.QuestionChoice;
-import com.example.demo.domain.QuestionPhaseRelation;
-import com.example.demo.domain.QuestionnairePhase;
-import com.example.demo.domain.Task;
-import com.example.demo.domain.TrainingPhase;
-import com.example.demo.dto.AbstractPhaseDto;
-import com.example.demo.dto.DecisionMatrixRowDto;
-import com.example.demo.dto.InfoPhaseDto;
-import com.example.demo.dto.InfoPhaseUpdateDto;
-import com.example.demo.dto.QuestionChoiceDto;
-import com.example.demo.dto.QuestionDto;
-import com.example.demo.dto.QuestionPhaseRelationDto;
-import com.example.demo.dto.QuestionRequiredIdDto;
-import com.example.demo.dto.QuestionUpdateDto;
-import com.example.demo.dto.QuestionnairePhaseDto;
-import com.example.demo.dto.QuestionnaireUpdateDto;
-import com.example.demo.dto.TaskCreateDto;
-import com.example.demo.dto.TaskDto;
-import com.example.demo.dto.TaskUpdateDto;
-import com.example.demo.dto.TrainingPhaseDto;
-import com.example.demo.dto.TrainingPhaseUpdateDto;
+package cz.muni.ics.kypo.training.adaptive.mapper;
+
+import cz.muni.ics.kypo.training.adaptive.domain.AbstractPhase;
+import cz.muni.ics.kypo.training.adaptive.domain.DecisionMatrixRow;
+import cz.muni.ics.kypo.training.adaptive.domain.InfoPhase;
+import cz.muni.ics.kypo.training.adaptive.domain.Question;
+import cz.muni.ics.kypo.training.adaptive.domain.QuestionChoice;
+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.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.TaskCreateDto;
+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 org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.factory.Mappers;
diff --git a/src/main/java/com/example/demo/repository/AbstractPhaseRepository.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/AbstractPhaseRepository.java
similarity index 94%
rename from src/main/java/com/example/demo/repository/AbstractPhaseRepository.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/repository/AbstractPhaseRepository.java
index 1b8c6a039ee092ae22c138fa13196c3d91a32114..3c40278845390236980b3cafdefa214132229139 100644
--- a/src/main/java/com/example/demo/repository/AbstractPhaseRepository.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/AbstractPhaseRepository.java
@@ -1,6 +1,6 @@
-package com.example.demo.repository;
+package cz.muni.ics.kypo.training.adaptive.repository;
 
-import com.example.demo.domain.AbstractPhase;
+import cz.muni.ics.kypo.training.adaptive.domain.AbstractPhase;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
diff --git a/src/main/java/com/example/demo/repository/InfoPhaseRepository.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/InfoPhaseRepository.java
similarity index 55%
rename from src/main/java/com/example/demo/repository/InfoPhaseRepository.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/repository/InfoPhaseRepository.java
index c9877448d29096f66dc048be91f3cbbac6e824d4..37ab685feef52764aa1e33a777886ede431e6d72 100644
--- a/src/main/java/com/example/demo/repository/InfoPhaseRepository.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/InfoPhaseRepository.java
@@ -1,6 +1,6 @@
-package com.example.demo.repository;
+package cz.muni.ics.kypo.training.adaptive.repository;
 
-import com.example.demo.domain.InfoPhase;
+import cz.muni.ics.kypo.training.adaptive.domain.InfoPhase;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface InfoPhaseRepository extends JpaRepository<InfoPhase, Long> {
diff --git a/src/main/java/com/example/demo/repository/QuestionChoiceRepository.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/QuestionChoiceRepository.java
similarity index 86%
rename from src/main/java/com/example/demo/repository/QuestionChoiceRepository.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/repository/QuestionChoiceRepository.java
index 7d403efea34d9eb8313b05c2a2706dadfa61ecff..88afad95e4438ecba70d3db7b6a7d604fc8ad34c 100644
--- a/src/main/java/com/example/demo/repository/QuestionChoiceRepository.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/QuestionChoiceRepository.java
@@ -1,6 +1,6 @@
-package com.example.demo.repository;
+package cz.muni.ics.kypo.training.adaptive.repository;
 
-import com.example.demo.domain.QuestionChoice;
+import cz.muni.ics.kypo.training.adaptive.domain.QuestionChoice;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
diff --git a/src/main/java/com/example/demo/repository/QuestionPhaseRelationRepository.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/QuestionPhaseRelationRepository.java
similarity index 56%
rename from src/main/java/com/example/demo/repository/QuestionPhaseRelationRepository.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/repository/QuestionPhaseRelationRepository.java
index 49057b935ff93989acab6579e00a30347787bee3..c5f3cf6a7a12d5181a4a2e264859c2c7eeec4af6 100644
--- a/src/main/java/com/example/demo/repository/QuestionPhaseRelationRepository.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/QuestionPhaseRelationRepository.java
@@ -1,6 +1,6 @@
-package com.example.demo.repository;
+package cz.muni.ics.kypo.training.adaptive.repository;
 
-import com.example.demo.domain.QuestionPhaseRelation;
+import cz.muni.ics.kypo.training.adaptive.domain.QuestionPhaseRelation;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface QuestionPhaseRelationRepository extends JpaRepository<QuestionPhaseRelation, Long> {
diff --git a/src/main/java/com/example/demo/repository/QuestionRepository.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/QuestionRepository.java
similarity index 88%
rename from src/main/java/com/example/demo/repository/QuestionRepository.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/repository/QuestionRepository.java
index 13648e4086fdab8f6c93e1ebfba015872879b9c6..4add485bc30e693211660b6786a5231b27c6f157 100644
--- a/src/main/java/com/example/demo/repository/QuestionRepository.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/QuestionRepository.java
@@ -1,6 +1,6 @@
-package com.example.demo.repository;
+package cz.muni.ics.kypo.training.adaptive.repository;
 
-import com.example.demo.domain.Question;
+import cz.muni.ics.kypo.training.adaptive.domain.Question;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
diff --git a/src/main/java/com/example/demo/repository/QuestionnairePhaseRepository.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/QuestionnairePhaseRepository.java
similarity index 56%
rename from src/main/java/com/example/demo/repository/QuestionnairePhaseRepository.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/repository/QuestionnairePhaseRepository.java
index 268cdd53520ad54cba84e5e99b6a28fb478df947..26cf52a45159c455afeeb873ef71635a777a6924 100644
--- a/src/main/java/com/example/demo/repository/QuestionnairePhaseRepository.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/QuestionnairePhaseRepository.java
@@ -1,6 +1,6 @@
-package com.example.demo.repository;
+package cz.muni.ics.kypo.training.adaptive.repository;
 
-import com.example.demo.domain.QuestionnairePhase;
+import cz.muni.ics.kypo.training.adaptive.domain.QuestionnairePhase;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface QuestionnairePhaseRepository extends JpaRepository<QuestionnairePhase, Long> {
diff --git a/src/main/java/com/example/demo/repository/TaskRepository.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/TaskRepository.java
similarity index 94%
rename from src/main/java/com/example/demo/repository/TaskRepository.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/repository/TaskRepository.java
index 584402d4f487a173fc7ec2cd6147f82967ebb12d..25d9484e2b3747d58eb72499e532424230ff521d 100644
--- a/src/main/java/com/example/demo/repository/TaskRepository.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/TaskRepository.java
@@ -1,6 +1,6 @@
-package com.example.demo.repository;
+package cz.muni.ics.kypo.training.adaptive.repository;
 
-import com.example.demo.domain.Task;
+import cz.muni.ics.kypo.training.adaptive.domain.Task;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
diff --git a/src/main/java/com/example/demo/repository/TrainingPhaseRepository.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/TrainingPhaseRepository.java
similarity index 83%
rename from src/main/java/com/example/demo/repository/TrainingPhaseRepository.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/repository/TrainingPhaseRepository.java
index eee479058627befc3129ba0b059dac4b1d3816da..50903da8ee37a6694e77fbc06c8b6cd86281e021 100644
--- a/src/main/java/com/example/demo/repository/TrainingPhaseRepository.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/TrainingPhaseRepository.java
@@ -1,6 +1,6 @@
-package com.example.demo.repository;
+package cz.muni.ics.kypo.training.adaptive.repository;
 
-import com.example.demo.domain.TrainingPhase;
+import cz.muni.ics.kypo.training.adaptive.domain.TrainingPhase;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
diff --git a/src/main/java/com/example/demo/service/InfoPhaseService.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/InfoPhaseService.java
similarity index 82%
rename from src/main/java/com/example/demo/service/InfoPhaseService.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/service/InfoPhaseService.java
index c0fb1d2bf3ac9100d3362d17692b461c579e2448..571993a8bbeacd261d769024e1cfc267a12624b8 100644
--- a/src/main/java/com/example/demo/service/InfoPhaseService.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/InfoPhaseService.java
@@ -1,11 +1,11 @@
-package com.example.demo.service;
-
-import com.example.demo.domain.InfoPhase;
-import com.example.demo.dto.InfoPhaseDto;
-import com.example.demo.dto.InfoPhaseUpdateDto;
-import com.example.demo.mapper.BeanMapper;
-import com.example.demo.repository.AbstractPhaseRepository;
-import com.example.demo.repository.InfoPhaseRepository;
+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.mapper.BeanMapper;
+import cz.muni.ics.kypo.training.adaptive.repository.AbstractPhaseRepository;
+import cz.muni.ics.kypo.training.adaptive.repository.InfoPhaseRepository;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/com/example/demo/service/PhaseService.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/PhaseService.java
similarity index 89%
rename from src/main/java/com/example/demo/service/PhaseService.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/service/PhaseService.java
index 3468202fdfc3b19a41a70b1710656cee37dc079f..b7facfc29ebaab48b7daba64626cd31283d01b2f 100644
--- a/src/main/java/com/example/demo/service/PhaseService.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/PhaseService.java
@@ -1,9 +1,9 @@
-package com.example.demo.service;
+package cz.muni.ics.kypo.training.adaptive.service;
 
-import com.example.demo.domain.AbstractPhase;
-import com.example.demo.dto.AbstractPhaseDto;
-import com.example.demo.mapper.BeanMapper;
-import com.example.demo.repository.AbstractPhaseRepository;
+import cz.muni.ics.kypo.training.adaptive.domain.AbstractPhase;
+import cz.muni.ics.kypo.training.adaptive.dto.AbstractPhaseDto;
+import cz.muni.ics.kypo.training.adaptive.mapper.BeanMapper;
+import cz.muni.ics.kypo.training.adaptive.repository.AbstractPhaseRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/src/main/java/com/example/demo/service/QuestionChoiceService.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/QuestionChoiceService.java
similarity index 84%
rename from src/main/java/com/example/demo/service/QuestionChoiceService.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/service/QuestionChoiceService.java
index aeb3120148cbccc24ef7252b1f843d7984b0fbb8..3a444e0ba4645df6157fe70351a5b8e46ecad4b5 100644
--- a/src/main/java/com/example/demo/service/QuestionChoiceService.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/QuestionChoiceService.java
@@ -1,11 +1,11 @@
-package com.example.demo.service;
-
-import com.example.demo.domain.Question;
-import com.example.demo.domain.QuestionChoice;
-import com.example.demo.dto.QuestionChoiceDto;
-import com.example.demo.mapper.BeanMapper;
-import com.example.demo.repository.QuestionChoiceRepository;
-import com.example.demo.repository.QuestionRepository;
+package cz.muni.ics.kypo.training.adaptive.service;
+
+import cz.muni.ics.kypo.training.adaptive.domain.Question;
+import cz.muni.ics.kypo.training.adaptive.domain.QuestionChoice;
+import cz.muni.ics.kypo.training.adaptive.dto.QuestionChoiceDto;
+import cz.muni.ics.kypo.training.adaptive.mapper.BeanMapper;
+import cz.muni.ics.kypo.training.adaptive.repository.QuestionChoiceRepository;
+import cz.muni.ics.kypo.training.adaptive.repository.QuestionRepository;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/com/example/demo/service/QuestionService.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/QuestionService.java
similarity index 82%
rename from src/main/java/com/example/demo/service/QuestionService.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/service/QuestionService.java
index e978bc0ba6b0cbfd536b2ecf5c047bc7d6f892e6..99c83c2828062eb2d4e07f82e6cf99507f28c560 100644
--- a/src/main/java/com/example/demo/service/QuestionService.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/QuestionService.java
@@ -1,12 +1,12 @@
-package com.example.demo.service;
-
-import com.example.demo.domain.Question;
-import com.example.demo.domain.QuestionnairePhase;
-import com.example.demo.dto.QuestionDto;
-import com.example.demo.enums.QuestionType;
-import com.example.demo.mapper.BeanMapper;
-import com.example.demo.repository.QuestionRepository;
-import com.example.demo.repository.QuestionnairePhaseRepository;
+package cz.muni.ics.kypo.training.adaptive.service;
+
+import cz.muni.ics.kypo.training.adaptive.domain.Question;
+import cz.muni.ics.kypo.training.adaptive.domain.QuestionnairePhase;
+import cz.muni.ics.kypo.training.adaptive.dto.QuestionDto;
+import cz.muni.ics.kypo.training.adaptive.enums.QuestionType;
+import cz.muni.ics.kypo.training.adaptive.mapper.BeanMapper;
+import cz.muni.ics.kypo.training.adaptive.repository.QuestionRepository;
+import cz.muni.ics.kypo.training.adaptive.repository.QuestionnairePhaseRepository;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/com/example/demo/service/QuestionnairePhaseService.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/QuestionnairePhaseService.java
similarity index 83%
rename from src/main/java/com/example/demo/service/QuestionnairePhaseService.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/service/QuestionnairePhaseService.java
index d2a095fbd8517030cfa43e82be6d43a418d27cd6..33e8479c7ce0e615dfa5c9fcaaada43881b28988 100644
--- a/src/main/java/com/example/demo/service/QuestionnairePhaseService.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/QuestionnairePhaseService.java
@@ -1,21 +1,21 @@
-package com.example.demo.service;
-
-import com.example.demo.domain.Question;
-import com.example.demo.domain.QuestionPhaseRelation;
-import com.example.demo.domain.QuestionnairePhase;
-import com.example.demo.domain.TrainingPhase;
-import com.example.demo.dto.PhaseCreateDTO;
-import com.example.demo.dto.QuestionPhaseRelationDto;
-import com.example.demo.dto.QuestionnairePhaseDto;
-import com.example.demo.dto.QuestionnaireUpdateDto;
-import com.example.demo.enums.PhaseType;
-import com.example.demo.enums.QuestionnaireType;
-import com.example.demo.mapper.BeanMapper;
-import com.example.demo.repository.AbstractPhaseRepository;
-import com.example.demo.repository.QuestionPhaseRelationRepository;
-import com.example.demo.repository.QuestionRepository;
-import com.example.demo.repository.QuestionnairePhaseRepository;
-import com.example.demo.repository.TrainingPhaseRepository;
+package cz.muni.ics.kypo.training.adaptive.service;
+
+import cz.muni.ics.kypo.training.adaptive.domain.Question;
+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.enums.PhaseType;
+import cz.muni.ics.kypo.training.adaptive.enums.QuestionnaireType;
+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.QuestionPhaseRelationRepository;
+import cz.muni.ics.kypo.training.adaptive.repository.QuestionRepository;
+import cz.muni.ics.kypo.training.adaptive.repository.QuestionnairePhaseRepository;
+import cz.muni.ics.kypo.training.adaptive.repository.TrainingPhaseRepository;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/com/example/demo/service/TaskService.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/TaskService.java
similarity index 90%
rename from src/main/java/com/example/demo/service/TaskService.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/service/TaskService.java
index ebd1fb431dc74d17ebef7076dd8bc9556bbc2900..35020121b68887e22057ba5c37fe5b52ea0d6fef 100644
--- a/src/main/java/com/example/demo/service/TaskService.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/TaskService.java
@@ -1,13 +1,13 @@
-package com.example.demo.service;
-
-import com.example.demo.domain.Task;
-import com.example.demo.domain.TrainingPhase;
-import com.example.demo.dto.TaskCreateDto;
-import com.example.demo.dto.TaskDto;
-import com.example.demo.dto.TaskUpdateDto;
-import com.example.demo.mapper.BeanMapper;
-import com.example.demo.repository.TaskRepository;
-import com.example.demo.repository.TrainingPhaseRepository;
+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.TaskCreateDto;
+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.mapper.BeanMapper;
+import cz.muni.ics.kypo.training.adaptive.repository.TaskRepository;
+import cz.muni.ics.kypo.training.adaptive.repository.TrainingPhaseRepository;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
diff --git a/src/main/java/com/example/demo/service/TrainingPhaseService.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/TrainingPhaseService.java
similarity index 91%
rename from src/main/java/com/example/demo/service/TrainingPhaseService.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/service/TrainingPhaseService.java
index 41c226b41d89d7ada047d26c8a6bd6819ab788f5..96103a5c5f0f2b5026b36ef8eec07c9b33f15cd8 100644
--- a/src/main/java/com/example/demo/service/TrainingPhaseService.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/TrainingPhaseService.java
@@ -1,12 +1,12 @@
-package com.example.demo.service;
-
-import com.example.demo.domain.DecisionMatrixRow;
-import com.example.demo.domain.TrainingPhase;
-import com.example.demo.dto.TrainingPhaseDto;
-import com.example.demo.dto.TrainingPhaseUpdateDto;
-import com.example.demo.mapper.BeanMapper;
-import com.example.demo.repository.AbstractPhaseRepository;
-import com.example.demo.repository.TrainingPhaseRepository;
+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.mapper.BeanMapper;
+import cz.muni.ics.kypo.training.adaptive.repository.AbstractPhaseRepository;
+import cz.muni.ics.kypo.training.adaptive.repository.TrainingPhaseRepository;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/test/java/com/example/demo/DemoApplicationTests.java b/src/test/java/cz/muni/ics/kypo/training/adaptive/DemoApplicationTests.java
similarity index 80%
rename from src/test/java/com/example/demo/DemoApplicationTests.java
rename to src/test/java/cz/muni/ics/kypo/training/adaptive/DemoApplicationTests.java
index 2778a6a7ea46c6d689985e372bf125017e96aa69..6a9221cfb2fb29b060a75d1d84162896236a21d9 100644
--- a/src/test/java/com/example/demo/DemoApplicationTests.java
+++ b/src/test/java/cz/muni/ics/kypo/training/adaptive/DemoApplicationTests.java
@@ -1,4 +1,4 @@
-package com.example.demo;
+package cz.muni.ics.kypo.training.adaptive;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;