diff --git a/client/src/components/Chapter.vue b/client/src/components/Chapter.vue
index 5e845597..5fa0a530 100644
--- a/client/src/components/Chapter.vue
+++ b/client/src/components/Chapter.vue
@@ -65,7 +65,7 @@ import {hidden} from '@/helpers/visibility';
 import {CONTENT_TYPE, CHAPTER_DESCRIPTION_TYPE, CHAPTER_TITLE_TYPE} from '@/consts/types';
 
 import UPDATE_CHAPTER_BOOKMARK_MUTATION from '@/graphql/gql/mutations/updateChapterBookmark.gql';
-import CHAPTER_QUERY from '@/graphql/gql/chapterQuery.gql';
+import CHAPTER_QUERY from '@/graphql/gql/queries/chapterQuery.gql';
 
 import me from '@/mixins/me';
 
diff --git a/client/src/components/ContentBlock.vue b/client/src/components/ContentBlock.vue
index c0490b65..637f3171 100644
--- a/client/src/components/ContentBlock.vue
+++ b/client/src/components/ContentBlock.vue
@@ -57,7 +57,7 @@
   import VisibilityAction from '@/components/visibility/VisibilityAction';
   import ContentComponent from '@/components/content-blocks/ContentComponent';
 
-  import CHAPTER_QUERY from '@/graphql/gql/chapterQuery.gql';
+  import CHAPTER_QUERY from '@/graphql/gql/queries/chapterQuery.gql';
   import DELETE_CONTENT_BLOCK_MUTATION from '@/graphql/gql/mutations/deleteContentBlock.gql';
 
   import {mapState} from 'vuex';
diff --git a/client/src/components/book-navigation/BookTopicNavigation.vue b/client/src/components/book-navigation/BookTopicNavigation.vue
index 0e039c06..eac54326 100644
--- a/client/src/components/book-navigation/BookTopicNavigation.vue
+++ b/client/src/components/book-navigation/BookTopicNavigation.vue
@@ -16,7 +16,7 @@
 </template>
 
 <script>
-  import ALL_TOPICS_QUERY from '@/graphql/gql/allTopicsQuery.gql';
+  import ALL_TOPICS_QUERY from '@/graphql/gql/queries/allTopicsQuery.gql';
   import sidebarMixin from '@/mixins/sidebar';
 
   export default {
diff --git a/client/src/components/content-block-form/EditContentBlockWizard.vue b/client/src/components/content-block-form/EditContentBlockWizard.vue
index 08013e76..6ed5e806 100644
--- a/client/src/components/content-block-form/EditContentBlockWizard.vue
+++ b/client/src/components/content-block-form/EditContentBlockWizard.vue
@@ -13,8 +13,8 @@
   import store from '@/store/index';
 
   import EDIT_CONTENT_BLOCK_MUTATION from '@/graphql/gql/mutations/mutateContentBlock.gql';
-  import MODULE_DETAILS_QUERY from '@/graphql/gql/moduleDetailsQuery.gql';
-  import CONTENT_BLOCK_QUERY from '@/graphql/gql/contentBlockQuery.gql';
+  import MODULE_DETAILS_QUERY from '@/graphql/gql/queries/moduleDetailsQuery.gql';
+  import CONTENT_BLOCK_QUERY from '@/graphql/gql/queries/contentBlockQuery.gql';
   import { setUserBlockType } from '@/helpers/content-block';
 
   export default {
diff --git a/client/src/components/content-block-form/NewContentBlockWizard.vue b/client/src/components/content-block-form/NewContentBlockWizard.vue
index 21d24faa..e3c21b09 100644
--- a/client/src/components/content-block-form/NewContentBlockWizard.vue
+++ b/client/src/components/content-block-form/NewContentBlockWizard.vue
@@ -12,7 +12,7 @@
   import ContentsForm from '@/components/content-block-form/ContentsForm';
 
   import NEW_CONTENT_BLOCK_MUTATION from '@/graphql/gql/mutations/addContentBlock.gql';
-  import MODULE_DETAILS_QUERY from '@/graphql/gql/moduleDetailsQuery.gql';
+  import MODULE_DETAILS_QUERY from '@/graphql/gql/queries/moduleDetailsQuery.gql';
   import {setUserBlockType} from '@/helpers/content-block';
 
   export default {
diff --git a/client/src/components/content-blocks/assignment/Assignment.vue b/client/src/components/content-blocks/assignment/Assignment.vue
index 9942266c..3ca642f3 100644
--- a/client/src/components/content-blocks/assignment/Assignment.vue
+++ b/client/src/components/content-blocks/assignment/Assignment.vue
@@ -48,8 +48,8 @@
 
 <script>
   import {mapGetters, mapActions} from 'vuex';
-  import ASSIGNMENT_QUERY from '@/graphql/gql/assignmentQuery.gql';
-  import ME_QUERY from '@/graphql/gql/meQuery.gql';
+  import ASSIGNMENT_QUERY from '@/graphql/gql/queries/assignmentQuery.gql';
+  import ME_QUERY from '@/graphql/gql/queries/meQuery.gql';
   import UPDATE_ASSIGNMENT_MUTATION from '@/graphql/gql/mutations/updateAssignmentMutation.gql';
   import UPDATE_ASSIGNMENT_MUTATION_WITH_SUCCESS from '@/graphql/gql/mutations/updateAssignmentMutationWithSuccess.gql';
   import SPELL_CHECK_MUTATION from '@/graphql/gql/mutations/spellCheck.gql';
diff --git a/client/src/components/notes/EditNoteWizard.vue b/client/src/components/notes/EditNoteWizard.vue
index f0d61e13..60379e5b 100644
--- a/client/src/components/notes/EditNoteWizard.vue
+++ b/client/src/components/notes/EditNoteWizard.vue
@@ -9,8 +9,8 @@
   import NoteForm from '@/components/notes/NoteForm';
 
   import UPDATE_NOTE_MUTATION from '@/graphql/gql/mutations/updateNote.gql';
-  import MODULE_DETAILS_QUERY from '@/graphql/gql/moduleDetailsQuery.gql';
-  import INSTRUMENT_QUERY from '@/graphql/gql/instrumentQuery.gql';
+  import MODULE_DETAILS_QUERY from '@/graphql/gql/queries/moduleDetailsQuery.gql';
+  import INSTRUMENT_QUERY from '@/graphql/gql/queries/instrumentQuery.gql';
 
   import {mapGetters} from 'vuex';
 
diff --git a/client/src/components/objective-groups/NewObjectiveWizard.vue b/client/src/components/objective-groups/NewObjectiveWizard.vue
index 33dc0b83..e70fbb5f 100644
--- a/client/src/components/objective-groups/NewObjectiveWizard.vue
+++ b/client/src/components/objective-groups/NewObjectiveWizard.vue
@@ -24,7 +24,7 @@
   import ModalInput from '@/components/ModalInput';
 
   import NEW_OBJECTIVE_MUTATION from '@/graphql/gql/mutations/addObjective.gql';
-  import OBJECTIVE_GROUP_QUERY from '@/graphql/gql/objectiveGroupQuery.gql';
+  import OBJECTIVE_GROUP_QUERY from '@/graphql/gql/queries/objectiveGroupQuery.gql';
 
   import {mapGetters} from 'vuex';
 
diff --git a/client/src/components/objective-groups/Objective.vue b/client/src/components/objective-groups/Objective.vue
index c0032716..0144635d 100644
--- a/client/src/components/objective-groups/Objective.vue
+++ b/client/src/components/objective-groups/Objective.vue
@@ -30,7 +30,7 @@
   import MoreOptionsWidget from '@/components/MoreOptionsWidget';
 
   import DELETE_OBJECTIVE_MUTATION from '@/graphql/gql/mutations/deleteObjective.gql';
-  import MODULE_DETAILS_QUERY from '@/graphql/gql/moduleDetailsQuery.gql';
+  import MODULE_DETAILS_QUERY from '@/graphql/gql/queries/moduleDetailsQuery.gql';
   import {hidden} from '@/helpers/visibility';
   import {OBJECTIVE_TYPE} from '@/consts/types';
 
diff --git a/client/src/components/portfolio/EditProjectEntryWizard.vue b/client/src/components/portfolio/EditProjectEntryWizard.vue
index 77e1cb8a..1c353931 100644
--- a/client/src/components/portfolio/EditProjectEntryWizard.vue
+++ b/client/src/components/portfolio/EditProjectEntryWizard.vue
@@ -10,7 +10,7 @@
 
   import {mapGetters} from 'vuex';
 
-  import PROJECT_ENTRY_QUERY from '@/graphql/gql/projectEntryQuery.gql';
+  import PROJECT_ENTRY_QUERY from '@/graphql/gql/queries/projectEntryQuery.gql';
   import UPDATE_PROJECT_ENTRY_MUTATION from '@/graphql/gql/mutations/updateProjectEntry.gql';
 
   export default {
diff --git a/client/src/components/portfolio/NewProjectEntryWizard.vue b/client/src/components/portfolio/NewProjectEntryWizard.vue
index 47d08df4..9712e99c 100644
--- a/client/src/components/portfolio/NewProjectEntryWizard.vue
+++ b/client/src/components/portfolio/NewProjectEntryWizard.vue
@@ -9,7 +9,7 @@
   import ProjectEntryForm from './ProjectEntryForm';
 
   import NEW_PROJECT_ENTRY_MUTATION from '@/graphql/gql/mutations/addProjectEntry.gql';
-  import PROJECT_QUERY from '@/graphql/gql/projectQuery.gql';
+  import PROJECT_QUERY from '@/graphql/gql/queries/projectQuery.gql';
 
   export default {
     components: {
diff --git a/client/src/components/portfolio/ProjectActions.vue b/client/src/components/portfolio/ProjectActions.vue
index 8e21dac2..6d33e2f4 100644
--- a/client/src/components/portfolio/ProjectActions.vue
+++ b/client/src/components/portfolio/ProjectActions.vue
@@ -28,8 +28,8 @@
   import WidgetPopover from '@/components/WidgetPopover';
 
   import DELETE_PROJECT_MUTATION from '@/graphql/gql/mutations/deleteProject.gql';
-  import PROJECT_QUERY from '@/graphql/gql/projectQuery.gql';
-  import PROJECTS_QUERY from '@/graphql/gql/allProjects.gql';
+  import PROJECT_QUERY from '@/graphql/gql/queries/projectQuery.gql';
+  import PROJECTS_QUERY from '@/graphql/gql/queries/allProjects.gql';
   import UPDATE_PROJECT_SHARED_STATE_MUTATION from '@/graphql/gql/mutations/updateProjectSharedState.gql';
 
   export default {
diff --git a/client/src/components/portfolio/ProjectEntry.vue b/client/src/components/portfolio/ProjectEntry.vue
index 906e0be4..47e61edc 100644
--- a/client/src/components/portfolio/ProjectEntry.vue
+++ b/client/src/components/portfolio/ProjectEntry.vue
@@ -45,7 +45,7 @@
   import MoreOptionsWidget from '@/components/MoreOptionsWidget';
 
   import DELETE_PROJECT_ENTRY_MUTATION from '@/graphql/gql/mutations/deleteProjectEntry.gql';
-  import PROJECT_QUERY from '@/graphql/gql/projectQuery.gql';
+  import PROJECT_QUERY from '@/graphql/gql/queries/projectQuery.gql';
 
   export default {
     props: ['activity', 'reflection', 'nextSteps', 'documentUrl', 'created', 'id'],
diff --git a/client/src/components/profile/EditTeamNameWizard.vue b/client/src/components/profile/EditTeamNameWizard.vue
index aa455563..93f7af33 100644
--- a/client/src/components/profile/EditTeamNameWizard.vue
+++ b/client/src/components/profile/EditTeamNameWizard.vue
@@ -12,7 +12,7 @@
   import me from '@/mixins/me';
   import EditNameWizard from '@/components/profile/EditNameWizard';
   import UPDATE_TEAM_MUTATION from '@/graphql/gql/mutations/updateTeam.gql';
-  import ME_QUERY from '@/graphql/gql/meQuery.gql';
+  import ME_QUERY from '@/graphql/gql/queries/meQuery.gql';
 
   export default {
     mixins: [me],
diff --git a/client/src/components/profile/Profile.vue b/client/src/components/profile/Profile.vue
index dc68484b..3b5f7849 100644
--- a/client/src/components/profile/Profile.vue
+++ b/client/src/components/profile/Profile.vue
@@ -21,7 +21,7 @@
 
 <script>
   import UPDATE_AVATAR_QUERY from '@/graphql/gql/mutations/updateAvatarUrl.gql';
-  import ME_QUERY from '@/graphql/gql/meQuery.gql';
+  import ME_QUERY from '@/graphql/gql/queries/meQuery.gql';
   import AvatarUploadForm from '@/components/profile/AvatarUploadForm';
   import Avatar from '@/components/profile/Avatar';
   import TrashIcon from '@/components/icons/TrashIcon';
diff --git a/client/src/components/rooms/RoomActions.vue b/client/src/components/rooms/RoomActions.vue
index 52368a88..4263c3a7 100644
--- a/client/src/components/rooms/RoomActions.vue
+++ b/client/src/components/rooms/RoomActions.vue
@@ -20,7 +20,7 @@
   import WidgetPopover from '@/components/WidgetPopover';
 
   import DELETE_ROOM_MUTATION from '@/graphql/gql/mutations/deleteRoom.gql';
-  import ROOMS_QUERY from '@/graphql/gql/roomsQuery.gql';
+  import ROOMS_QUERY from '@/graphql/gql/queries/roomsQuery.gql';
 
   export default {
     props: ['id'],
diff --git a/client/src/components/rooms/RoomEntry.vue b/client/src/components/rooms/RoomEntry.vue
index 005c8d62..e1ff6014 100644
--- a/client/src/components/rooms/RoomEntry.vue
+++ b/client/src/components/rooms/RoomEntry.vue
@@ -34,8 +34,8 @@
 
 <script>
   import DELETE_ROOM_ENTRY_MUTATION from '@/graphql/gql/mutations/deleteRoomEntry.gql';
-  import ROOM_ENTRIES_QUERY from '@/graphql/gql/roomEntriesQuery.gql';
-  import ME_QUERY from '@/graphql/gql/meQuery.gql';
+  import ROOM_ENTRIES_QUERY from '@/graphql/gql/queries/roomEntriesQuery.gql';
+  import ME_QUERY from '@/graphql/gql/queries/meQuery.gql';
 
   import UserMetaWidget from '@/components/UserMetaWidget';
   import MoreOptionsWidget from '@/components/MoreOptionsWidget';
diff --git a/client/src/components/rooms/RoomForm.vue b/client/src/components/rooms/RoomForm.vue
index f65603c7..e01d46a6 100644
--- a/client/src/components/rooms/RoomForm.vue
+++ b/client/src/components/rooms/RoomForm.vue
@@ -57,7 +57,7 @@
   import PageForm from '@/components/page-form/PageForm';
   import PageFormInput from '@/components/page-form/PageFormInput';
 
-  import ME_QUERY from '@/graphql/gql/meQuery.gql';
+  import ME_QUERY from '@/graphql/gql/queries/meQuery.gql';
 
   export default {
     props: ['room'],
diff --git a/client/src/components/rooms/room-entries/EditRoomEntryWizard.vue b/client/src/components/rooms/room-entries/EditRoomEntryWizard.vue
index 50fa0418..5847ff12 100644
--- a/client/src/components/rooms/room-entries/EditRoomEntryWizard.vue
+++ b/client/src/components/rooms/room-entries/EditRoomEntryWizard.vue
@@ -11,7 +11,7 @@
 
 <script>
   import UPDATE_ROOM_ENTRY_MUTATION from '@/graphql/gql/mutations/updateRoomEntry.gql';
-  import ROOM_ENTRY_QUERY from '@/graphql/gql/roomEntryByIdQuery.gql';
+  import ROOM_ENTRY_QUERY from '@/graphql/gql/queries/roomEntryByIdQuery.gql';
 
   import ContentsForm from '@/components/content-block-form/ContentsForm';
 
diff --git a/client/src/components/rooms/room-entries/NewRoomEntryWizard.vue b/client/src/components/rooms/room-entries/NewRoomEntryWizard.vue
index c8f66ee7..1f8ba7ec 100644
--- a/client/src/components/rooms/room-entries/NewRoomEntryWizard.vue
+++ b/client/src/components/rooms/room-entries/NewRoomEntryWizard.vue
@@ -11,7 +11,7 @@
 
 <script>
   import NEW_ROOM_ENTRY_MUTATION from '@/graphql/gql/mutations/addRoomEntry.gql';
-  import ROOM_ENTRIES_QUERY from '@/graphql/gql/roomEntriesQuery.gql';
+  import ROOM_ENTRIES_QUERY from '@/graphql/gql/queries/roomEntriesQuery.gql';
 
   import ContentsForm from '@/components/content-block-form/ContentsForm';
 
diff --git a/client/src/components/school-class/EditClassNameWizard.vue b/client/src/components/school-class/EditClassNameWizard.vue
index 9590d0f0..0aa4ba9f 100644
--- a/client/src/components/school-class/EditClassNameWizard.vue
+++ b/client/src/components/school-class/EditClassNameWizard.vue
@@ -8,7 +8,7 @@
 </template>
 
 <script>
-  import MY_SCHOOL_CLASS_QUERY from '@/graphql/gql/mySchoolClass.gql';
+  import MY_SCHOOL_CLASS_QUERY from '@/graphql/gql/queries/mySchoolClass.gql';
   import UPDATE_SCHOOL_CLASS_MUTATION from '@/graphql/gql/mutations/updateSchoolClass.gql';
   import EditNameWizard from '@/components/profile/EditNameWizard';
 
diff --git a/client/src/graphql/gql/allContentBlocksCacheQuery.gql b/client/src/graphql/gql/queries/allContentBlocksCacheQuery.gql
similarity index 69%
rename from client/src/graphql/gql/allContentBlocksCacheQuery.gql
rename to client/src/graphql/gql/queries/allContentBlocksCacheQuery.gql
index 58d0f226..bc7feed1 100644
--- a/client/src/graphql/gql/allContentBlocksCacheQuery.gql
+++ b/client/src/graphql/gql/queries/allContentBlocksCacheQuery.gql
@@ -1,5 +1,5 @@
 # to be read from cache only
-#import "./fragments/contentBlockParts.gql"
+#import "../fragments/contentBlockParts.gql"
 query ContentBlockQuery {
   contentBlocks {
     ...ContentBlockParts
diff --git a/client/src/graphql/gql/allModules.gql b/client/src/graphql/gql/queries/allModules.gql
similarity index 72%
rename from client/src/graphql/gql/allModules.gql
rename to client/src/graphql/gql/queries/allModules.gql
index c4b548de..4b0476e7 100644
--- a/client/src/graphql/gql/allModules.gql
+++ b/client/src/graphql/gql/queries/allModules.gql
@@ -1,4 +1,4 @@
-#import "./fragments/moduleParts.gql"
+#import "../fragments/moduleParts.gql"
 query ModulesQuery {
   modules {
     edges {
diff --git a/client/src/graphql/gql/allProjects.gql b/client/src/graphql/gql/queries/allProjects.gql
similarity index 72%
rename from client/src/graphql/gql/allProjects.gql
rename to client/src/graphql/gql/queries/allProjects.gql
index 47c5907d..82f30894 100644
--- a/client/src/graphql/gql/allProjects.gql
+++ b/client/src/graphql/gql/queries/allProjects.gql
@@ -1,4 +1,4 @@
-#import "./fragments/projectParts.gql"
+#import "../fragments/projectParts.gql"
 query ProjectsQuery {
   projects {
     edges {
diff --git a/client/src/graphql/gql/allTopicsQuery.gql b/client/src/graphql/gql/queries/allTopicsQuery.gql
similarity index 100%
rename from client/src/graphql/gql/allTopicsQuery.gql
rename to client/src/graphql/gql/queries/allTopicsQuery.gql
diff --git a/client/src/graphql/gql/assignmentQuery.gql b/client/src/graphql/gql/queries/assignmentQuery.gql
similarity index 66%
rename from client/src/graphql/gql/assignmentQuery.gql
rename to client/src/graphql/gql/queries/assignmentQuery.gql
index c16c2b01..43a27e2c 100644
--- a/client/src/graphql/gql/assignmentQuery.gql
+++ b/client/src/graphql/gql/queries/assignmentQuery.gql
@@ -1,4 +1,4 @@
-#import "./fragments/assignmentParts.gql"
+#import "../fragments/assignmentParts.gql"
 query AssignmentQuery($id: ID!) {
   assignment(id: $id) {
     ...AssignmentParts
diff --git a/client/src/graphql/gql/assignmentWithSubmissionsQuery.gql b/client/src/graphql/gql/queries/assignmentWithSubmissionsQuery.gql
similarity index 90%
rename from client/src/graphql/gql/assignmentWithSubmissionsQuery.gql
rename to client/src/graphql/gql/queries/assignmentWithSubmissionsQuery.gql
index 5cecca96..e78e6f62 100644
--- a/client/src/graphql/gql/assignmentWithSubmissionsQuery.gql
+++ b/client/src/graphql/gql/queries/assignmentWithSubmissionsQuery.gql
@@ -1,4 +1,4 @@
-#import "./fragments/schoolClassParts.gql"
+#import "../fragments/schoolClassParts.gql"
 query AssignmentWithSubmissions($id: ID!) {
   assignment(id: $id) {
     title
diff --git a/client/src/graphql/gql/assignmentsQuery.gql b/client/src/graphql/gql/queries/assignmentsQuery.gql
similarity index 72%
rename from client/src/graphql/gql/assignmentsQuery.gql
rename to client/src/graphql/gql/queries/assignmentsQuery.gql
index 73f6119c..279a3dd6 100644
--- a/client/src/graphql/gql/assignmentsQuery.gql
+++ b/client/src/graphql/gql/queries/assignmentsQuery.gql
@@ -1,4 +1,4 @@
-#import "./fragments/assignmentParts.gql"
+#import "../fragments/assignmentParts.gql"
 query AssignmentsQuery {
   assignments {
     edges {
diff --git a/client/src/graphql/gql/chapterQuery.gql b/client/src/graphql/gql/queries/chapterQuery.gql
similarity index 66%
rename from client/src/graphql/gql/chapterQuery.gql
rename to client/src/graphql/gql/queries/chapterQuery.gql
index 68136ae1..db6a2ece 100644
--- a/client/src/graphql/gql/chapterQuery.gql
+++ b/client/src/graphql/gql/queries/chapterQuery.gql
@@ -1,4 +1,4 @@
-#import "./fragments/chapterParts.gql"
+#import "../fragments/chapterParts.gql"
 query ChapterQuery($id: ID!) {
   chapter(id: $id) {
     ...ChapterParts
diff --git a/client/src/graphql/gql/contentBlockQuery.gql b/client/src/graphql/gql/queries/contentBlockQuery.gql
similarity index 67%
rename from client/src/graphql/gql/contentBlockQuery.gql
rename to client/src/graphql/gql/queries/contentBlockQuery.gql
index 1649d68f..42f7d2e2 100644
--- a/client/src/graphql/gql/contentBlockQuery.gql
+++ b/client/src/graphql/gql/queries/contentBlockQuery.gql
@@ -1,4 +1,4 @@
-#import "./fragments/contentBlockParts.gql"
+#import "../fragments/contentBlockParts.gql"
 query ContentBlockQuery($id: ID!) {
   contentBlock(id: $id) {
     ...ContentBlockParts
diff --git a/client/src/graphql/gql/instrumentQuery.gql b/client/src/graphql/gql/queries/instrumentQuery.gql
similarity index 69%
rename from client/src/graphql/gql/instrumentQuery.gql
rename to client/src/graphql/gql/queries/instrumentQuery.gql
index c89e8fcf..603b8474 100644
--- a/client/src/graphql/gql/instrumentQuery.gql
+++ b/client/src/graphql/gql/queries/instrumentQuery.gql
@@ -1,4 +1,4 @@
-#import "./fragments/instrumentParts.gql"
+#import "../fragments/instrumentParts.gql"
 query InstrumentQuery($slug: String!){
   instrument(slug: $slug) {
     ...InstrumentParts
diff --git a/client/src/graphql/gql/instrumentQueryById.gql b/client/src/graphql/gql/queries/instrumentQueryById.gql
similarity index 66%
rename from client/src/graphql/gql/instrumentQueryById.gql
rename to client/src/graphql/gql/queries/instrumentQueryById.gql
index f0fa658e..a0c139f9 100644
--- a/client/src/graphql/gql/instrumentQueryById.gql
+++ b/client/src/graphql/gql/queries/instrumentQueryById.gql
@@ -1,4 +1,4 @@
-#import "./fragments/instrumentParts.gql"
+#import "../fragments/instrumentParts.gql"
 query InstrumentQuery($id: ID!){
   instrument(id: $id) {
     ...InstrumentParts
diff --git a/client/src/graphql/gql/instrumentsByTypeQuery.gql b/client/src/graphql/gql/queries/instrumentsByTypeQuery.gql
similarity index 100%
rename from client/src/graphql/gql/instrumentsByTypeQuery.gql
rename to client/src/graphql/gql/queries/instrumentsByTypeQuery.gql
diff --git a/client/src/graphql/gql/instrumentsQuery.gql b/client/src/graphql/gql/queries/instrumentsQuery.gql
similarity index 100%
rename from client/src/graphql/gql/instrumentsQuery.gql
rename to client/src/graphql/gql/queries/instrumentsQuery.gql
diff --git a/client/src/graphql/gql/meQuery.gql b/client/src/graphql/gql/queries/meQuery.gql
similarity index 85%
rename from client/src/graphql/gql/meQuery.gql
rename to client/src/graphql/gql/queries/meQuery.gql
index 90cd15a2..c76b2793 100644
--- a/client/src/graphql/gql/meQuery.gql
+++ b/client/src/graphql/gql/queries/meQuery.gql
@@ -1,4 +1,4 @@
-#import "./fragments/userParts.gql"
+#import "../fragments/userParts.gql"
 query MeQuery {
   me {
     ...UserParts
diff --git a/client/src/graphql/gql/moduleByIdQuery.gql b/client/src/graphql/gql/queries/moduleByIdQuery.gql
similarity index 90%
rename from client/src/graphql/gql/moduleByIdQuery.gql
rename to client/src/graphql/gql/queries/moduleByIdQuery.gql
index 8ac81682..f2db8fbe 100644
--- a/client/src/graphql/gql/moduleByIdQuery.gql
+++ b/client/src/graphql/gql/queries/moduleByIdQuery.gql
@@ -1,4 +1,4 @@
-#import "./fragments/moduleParts.gql"
+#import "../fragments/moduleParts.gql"
 query ModuleQuery($id: ID!) {
   module(id: $id) {
     ...ModuleParts
diff --git a/client/src/graphql/gql/moduleDetailsQuery.gql b/client/src/graphql/gql/queries/moduleDetailsQuery.gql
similarity index 71%
rename from client/src/graphql/gql/moduleDetailsQuery.gql
rename to client/src/graphql/gql/queries/moduleDetailsQuery.gql
index 3d98c96c..5bd6497a 100644
--- a/client/src/graphql/gql/moduleDetailsQuery.gql
+++ b/client/src/graphql/gql/queries/moduleDetailsQuery.gql
@@ -1,8 +1,8 @@
-#import "./fragments/chapterParts.gql"
-#import "./fragments/assignmentParts.gql"
-#import "./fragments/objectiveGroupParts.gql"
-#import "./fragments/objectiveParts.gql"
-#import "./fragments/moduleParts.gql"
+#import "../fragments/chapterParts.gql"
+#import "../fragments/assignmentParts.gql"
+#import "../fragments/objectiveGroupParts.gql"
+#import "../fragments/objectiveParts.gql"
+#import "../fragments/moduleParts.gql"
 query ModuleDetailsQuery($slug: String!) {
   module(slug: $slug) {
     ...ModuleParts
diff --git a/client/src/graphql/gql/moduleRoomEntryQuery.gql b/client/src/graphql/gql/queries/moduleRoomEntryQuery.gql
similarity index 74%
rename from client/src/graphql/gql/moduleRoomEntryQuery.gql
rename to client/src/graphql/gql/queries/moduleRoomEntryQuery.gql
index 5f0d275d..e8f3dc76 100644
--- a/client/src/graphql/gql/moduleRoomEntryQuery.gql
+++ b/client/src/graphql/gql/queries/moduleRoomEntryQuery.gql
@@ -1,5 +1,5 @@
-#import "./fragments/roomParts.gql"
-#import "./fragments/roomEntryParts.gql"
+#import "../fragments/roomParts.gql"
+#import "../fragments/roomEntryParts.gql"
 query ModuleRoomEntriesQuery($slug: String, $classId: ID!) {
   moduleRoom(slug: $slug, classId: $classId) {
     ...RoomParts
diff --git a/client/src/graphql/gql/moduleSnapshots.gql b/client/src/graphql/gql/queries/moduleSnapshots.gql
similarity index 100%
rename from client/src/graphql/gql/moduleSnapshots.gql
rename to client/src/graphql/gql/queries/moduleSnapshots.gql
diff --git a/client/src/graphql/gql/myActivity.gql b/client/src/graphql/gql/queries/myActivity.gql
similarity index 100%
rename from client/src/graphql/gql/myActivity.gql
rename to client/src/graphql/gql/queries/myActivity.gql
diff --git a/client/src/graphql/gql/mySchoolClass.gql b/client/src/graphql/gql/queries/mySchoolClass.gql
similarity index 100%
rename from client/src/graphql/gql/mySchoolClass.gql
rename to client/src/graphql/gql/queries/mySchoolClass.gql
diff --git a/client/src/graphql/gql/newsTeasersQuery.gql b/client/src/graphql/gql/queries/newsTeasersQuery.gql
similarity index 100%
rename from client/src/graphql/gql/newsTeasersQuery.gql
rename to client/src/graphql/gql/queries/newsTeasersQuery.gql
diff --git a/client/src/graphql/gql/objectiveGroupQuery.gql b/client/src/graphql/gql/queries/objectiveGroupQuery.gql
similarity index 91%
rename from client/src/graphql/gql/objectiveGroupQuery.gql
rename to client/src/graphql/gql/queries/objectiveGroupQuery.gql
index 330ac4d8..80206606 100644
--- a/client/src/graphql/gql/objectiveGroupQuery.gql
+++ b/client/src/graphql/gql/queries/objectiveGroupQuery.gql
@@ -1,4 +1,4 @@
-#import "./fragments/objectiveGroupParts.gql"
+#import "../fragments/objectiveGroupParts.gql"
 query ObjectiveGroupQuery($id: ID!) {
   objectiveGroup(id: $id) {
     ...ObjectiveGroupParts
diff --git a/client/src/graphql/gql/objectiveQuery.gql b/client/src/graphql/gql/queries/objectiveQuery.gql
similarity index 100%
rename from client/src/graphql/gql/objectiveQuery.gql
rename to client/src/graphql/gql/queries/objectiveQuery.gql
diff --git a/client/src/graphql/gql/oldClasses.gql b/client/src/graphql/gql/queries/oldClasses.gql
similarity index 100%
rename from client/src/graphql/gql/oldClasses.gql
rename to client/src/graphql/gql/queries/oldClasses.gql
diff --git a/client/src/graphql/gql/projectEntryQuery.gql b/client/src/graphql/gql/queries/projectEntryQuery.gql
similarity index 67%
rename from client/src/graphql/gql/projectEntryQuery.gql
rename to client/src/graphql/gql/queries/projectEntryQuery.gql
index e395b7f9..21521c05 100644
--- a/client/src/graphql/gql/projectEntryQuery.gql
+++ b/client/src/graphql/gql/queries/projectEntryQuery.gql
@@ -1,4 +1,4 @@
-#import "./fragments/projectEntryParts.gql"
+#import "../fragments/projectEntryParts.gql"
 query ProjectEntryQuery($id: ID!) {
   projectEntry(id: $id) {
     ...ProjectEntryParts
diff --git a/client/src/graphql/gql/projectQuery.gql b/client/src/graphql/gql/queries/projectQuery.gql
similarity index 72%
rename from client/src/graphql/gql/projectQuery.gql
rename to client/src/graphql/gql/queries/projectQuery.gql
index dbae6ffc..ddae29a9 100644
--- a/client/src/graphql/gql/projectQuery.gql
+++ b/client/src/graphql/gql/queries/projectQuery.gql
@@ -1,5 +1,5 @@
-#import "./fragments/projectParts.gql"
-#import "./fragments/projectEntryParts.gql"
+#import "../fragments/projectParts.gql"
+#import "../fragments/projectEntryParts.gql"
 query ProjectQuery($id: ID, $slug: String){
   project(slug: $slug, id: $id) {
     ...ProjectParts
diff --git a/client/src/graphql/gql/roomEntriesQuery.gql b/client/src/graphql/gql/queries/roomEntriesQuery.gql
similarity index 70%
rename from client/src/graphql/gql/roomEntriesQuery.gql
rename to client/src/graphql/gql/queries/roomEntriesQuery.gql
index 44c54ea5..ae2ff158 100644
--- a/client/src/graphql/gql/roomEntriesQuery.gql
+++ b/client/src/graphql/gql/queries/roomEntriesQuery.gql
@@ -1,5 +1,5 @@
-#import "./fragments/roomParts.gql"
-#import "./fragments/roomEntryParts.gql"
+#import "../fragments/roomParts.gql"
+#import "../fragments/roomEntryParts.gql"
 query RoomEntriesQuery($slug: String!) {
   room(slug: $slug) {
     ...RoomParts
diff --git a/client/src/graphql/gql/roomEntryByIdQuery.gql b/client/src/graphql/gql/queries/roomEntryByIdQuery.gql
similarity index 66%
rename from client/src/graphql/gql/roomEntryByIdQuery.gql
rename to client/src/graphql/gql/queries/roomEntryByIdQuery.gql
index 3d9a42e6..75f1c86f 100644
--- a/client/src/graphql/gql/roomEntryByIdQuery.gql
+++ b/client/src/graphql/gql/queries/roomEntryByIdQuery.gql
@@ -1,4 +1,4 @@
-#import "./fragments/roomEntryParts.gql"
+#import "../fragments/roomEntryParts.gql"
 query RoomEntryQuery($id: ID!) {
   roomEntry(id: $id) {
     ...RoomEntryParts
diff --git a/client/src/graphql/gql/roomEntryQuery.gql b/client/src/graphql/gql/queries/roomEntryQuery.gql
similarity index 69%
rename from client/src/graphql/gql/roomEntryQuery.gql
rename to client/src/graphql/gql/queries/roomEntryQuery.gql
index 15a3bfe5..85076cf5 100644
--- a/client/src/graphql/gql/roomEntryQuery.gql
+++ b/client/src/graphql/gql/queries/roomEntryQuery.gql
@@ -1,4 +1,4 @@
-#import "./fragments/roomEntryParts.gql"
+#import "../fragments/roomEntryParts.gql"
 query RoomEntryQuery($slug: String!) {
   roomEntry(slug: $slug) {
     ...RoomEntryParts
diff --git a/client/src/graphql/gql/roomQuery.gql b/client/src/graphql/gql/queries/roomQuery.gql
similarity index 65%
rename from client/src/graphql/gql/roomQuery.gql
rename to client/src/graphql/gql/queries/roomQuery.gql
index b4092eed..3aacab78 100644
--- a/client/src/graphql/gql/roomQuery.gql
+++ b/client/src/graphql/gql/queries/roomQuery.gql
@@ -1,4 +1,4 @@
-#import "./fragments/roomParts.gql"
+#import "../fragments/roomParts.gql"
 query RoomQuery($id: ID!) {
   room(id: $id) {
     ...RoomParts
diff --git a/client/src/graphql/gql/roomsQuery.gql b/client/src/graphql/gql/queries/roomsQuery.gql
similarity index 71%
rename from client/src/graphql/gql/roomsQuery.gql
rename to client/src/graphql/gql/queries/roomsQuery.gql
index d25354d3..d98d8902 100644
--- a/client/src/graphql/gql/roomsQuery.gql
+++ b/client/src/graphql/gql/queries/roomsQuery.gql
@@ -1,4 +1,4 @@
-#import "./fragments/roomParts.gql"
+#import "../fragments/roomParts.gql"
 query RoomsQuery {
   rooms {
     edges {
diff --git a/client/src/graphql/gql/queries/snapshots/detail.gql b/client/src/graphql/gql/queries/snapshots/detail.gql
new file mode 100644
index 00000000..e69de29b
diff --git a/client/src/graphql/gql/snapshotsQuery.gql b/client/src/graphql/gql/queries/snapshots/snapshotsQuery.gql
similarity index 100%
rename from client/src/graphql/gql/snapshotsQuery.gql
rename to client/src/graphql/gql/queries/snapshots/snapshotsQuery.gql
diff --git a/client/src/graphql/gql/studentSubmissionQuery.gql b/client/src/graphql/gql/queries/studentSubmissionQuery.gql
similarity index 100%
rename from client/src/graphql/gql/studentSubmissionQuery.gql
rename to client/src/graphql/gql/queries/studentSubmissionQuery.gql
diff --git a/client/src/graphql/gql/surveyQuery.gql b/client/src/graphql/gql/queries/surveyQuery.gql
similarity index 100%
rename from client/src/graphql/gql/surveyQuery.gql
rename to client/src/graphql/gql/queries/surveyQuery.gql
diff --git a/client/src/graphql/gql/topicQuery.gql b/client/src/graphql/gql/queries/topicQuery.gql
similarity index 66%
rename from client/src/graphql/gql/topicQuery.gql
rename to client/src/graphql/gql/queries/topicQuery.gql
index 64226fe0..0537b5f3 100644
--- a/client/src/graphql/gql/topicQuery.gql
+++ b/client/src/graphql/gql/queries/topicQuery.gql
@@ -1,4 +1,4 @@
-#import "./fragments/topicParts.gql"
+#import "../fragments/topicParts.gql"
 query Topic($slug: String!){
   topic(slug: $slug) {
     ...TopicParts
diff --git a/client/src/graphql/queries.js b/client/src/graphql/queries.js
index abcecc8b..012b8236 100644
--- a/client/src/graphql/queries.js
+++ b/client/src/graphql/queries.js
@@ -1,5 +1,5 @@
-import MODULE_DETAILS_QUERY from './gql/moduleDetailsQuery.gql';
-import ME_QUERY from './gql/meQuery.gql';
+import MODULE_DETAILS_QUERY from './gql/queries/moduleDetailsQuery.gql';
+import ME_QUERY from './gql/queries/meQuery.gql';
 
 export function moduleQuery() {
   return {
diff --git a/client/src/helpers/new-note-mutation.js b/client/src/helpers/new-note-mutation.js
index 40c80299..bb061458 100644
--- a/client/src/helpers/new-note-mutation.js
+++ b/client/src/helpers/new-note-mutation.js
@@ -1,7 +1,7 @@
 import ADD_NOTE_MUTATION from '@/graphql/gql/mutations/addNote.gql';
-import CONTENT_BLOCK_QUERY from '@/graphql/gql/contentBlockQuery.gql';
-import CHAPTER_QUERY from '@/graphql/gql/chapterQuery.gql';
-import MODULE_QUERY from '@/graphql/gql/moduleByIdQuery.gql';
+import CONTENT_BLOCK_QUERY from '@/graphql/gql/queries/contentBlockQuery.gql';
+import CHAPTER_QUERY from '@/graphql/gql/queries/chapterQuery.gql';
+import MODULE_QUERY from '@/graphql/gql/queries/moduleByIdQuery.gql';
 import INSTRUMENT_FRAGMENT from '@/graphql/gql/fragments/instrumentParts.gql';
 
 const getBlockType = id => atob(id).split(':')[0];
diff --git a/client/src/helpers/update-content-bookmark-mutation.js b/client/src/helpers/update-content-bookmark-mutation.js
index 56da05ac..cedf0214 100644
--- a/client/src/helpers/update-content-bookmark-mutation.js
+++ b/client/src/helpers/update-content-bookmark-mutation.js
@@ -1,6 +1,6 @@
 import UPDATE_CONTENT_BOOKMARK from '@/graphql/gql/mutations/updateContentBookmark.gql';
 import UPDATE_INSTRUMENT_BOOKMARK from '@/graphql/gql/mutations/updateInstrumentBookmark.gql';
-import CONTENT_BLOCK_QUERY from '@/graphql/gql/contentBlockQuery.gql';
+import CONTENT_BLOCK_QUERY from '@/graphql/gql/queries/contentBlockQuery.gql';
 import INSTRUMENT_FRAGMENT from '@/graphql/gql/fragments/instrumentParts.gql';
 
 const compareUuid = uuid => element => element.uuid === uuid;
diff --git a/client/src/main.js b/client/src/main.js
index 0ec9bfd7..505c1625 100644
--- a/client/src/main.js
+++ b/client/src/main.js
@@ -15,7 +15,7 @@ import veeDe from 'vee-validate/dist/locale/de';
 import {dateFilter} from './filters/date-filter';
 import autoGrow from '@/directives/auto-grow';
 import clickOutside from '@/directives/click-outside';
-import ME_QUERY from '@/graphql/gql/meQuery.gql';
+import ME_QUERY from '@/graphql/gql/queries/meQuery.gql';
 import VueModal from '@/plugins/modal';
 import VueRemoveEdges from '@/plugins/edges';
 import VueMatomo from 'vue-matomo';
diff --git a/client/src/mixins/add-school-class.js b/client/src/mixins/add-school-class.js
index 8d6c576b..e1e39966 100644
--- a/client/src/mixins/add-school-class.js
+++ b/client/src/mixins/add-school-class.js
@@ -1,4 +1,4 @@
-import ME_QUERY from '@/graphql/gql/meQuery';
+import ME_QUERY from '@/graphql/gql/queries/meQuery';
 
 export default {
   methods: {
diff --git a/client/src/mixins/me.js b/client/src/mixins/me.js
index 75b28898..87618cc1 100644
--- a/client/src/mixins/me.js
+++ b/client/src/mixins/me.js
@@ -1,4 +1,4 @@
-import ME_QUERY from '@/graphql/gql/meQuery.gql';
+import ME_QUERY from '@/graphql/gql/queries/meQuery.gql';
 
 export default {
   data() {
diff --git a/client/src/mixins/news.js b/client/src/mixins/news.js
index 5dd6f1a4..8b3b57bc 100644
--- a/client/src/mixins/news.js
+++ b/client/src/mixins/news.js
@@ -1,4 +1,4 @@
-import NEWS_TEASER_QUERY from '@/graphql/gql/newsTeasersQuery.gql';
+import NEWS_TEASER_QUERY from '@/graphql/gql/queries/newsTeasersQuery.gql';
 
 export default {
   data() {
diff --git a/client/src/mixins/selected-class.js b/client/src/mixins/selected-class.js
index 98b653d1..b05f4632 100644
--- a/client/src/mixins/selected-class.js
+++ b/client/src/mixins/selected-class.js
@@ -1,4 +1,4 @@
-import MY_SCHOOL_CLASS_QUERY from '@/graphql/gql/mySchoolClass';
+import MY_SCHOOL_CLASS_QUERY from '@/graphql/gql/queries/mySchoolClass';
 
 export default {
   apollo: {
diff --git a/client/src/mixins/update-selected-class.js b/client/src/mixins/update-selected-class.js
index 0f9cb90d..62b2bf7d 100644
--- a/client/src/mixins/update-selected-class.js
+++ b/client/src/mixins/update-selected-class.js
@@ -1,6 +1,6 @@
-import ME_QUERY from '@/graphql/gql/meQuery.gql';
+import ME_QUERY from '@/graphql/gql/queries/meQuery.gql';
 import UPDATE_USER_SETTING from '@/graphql/gql/mutations/updateUserSetting.gql';
-import MY_SCHOOL_CLASS_QUERY from '@/graphql/gql/mySchoolClass.gql';
+import MY_SCHOOL_CLASS_QUERY from '@/graphql/gql/queries/mySchoolClass.gql';
 
 export default {
   methods: {
diff --git a/client/src/pages/activity.vue b/client/src/pages/activity.vue
index fe2dc4e1..20e2be01 100644
--- a/client/src/pages/activity.vue
+++ b/client/src/pages/activity.vue
@@ -26,7 +26,7 @@
   import ModuleActivity from '@/components/profile/ModuleActivity';
   import InstrumentActivity from '@/components/profile/InstrumentActivity';
   import ActivityFilter from '@/components/profile/ActivityFilter';
-  import MY_ACTIVITY_QUERY from '@/graphql/gql/myActivity.gql';
+  import MY_ACTIVITY_QUERY from '@/graphql/gql/queries/myActivity.gql';
 
   export default {
     components: {
diff --git a/client/src/pages/article.vue b/client/src/pages/article.vue
index f2a348fa..4b5b725a 100644
--- a/client/src/pages/article.vue
+++ b/client/src/pages/article.vue
@@ -26,7 +26,7 @@
   import DocumentBlock from '@/components/content-blocks/DocumentBlock';
   import UserMetaWidget from '@/components/UserMetaWidget';
 
-  import ROOM_ENTRY_QUERY from '@/graphql/gql/roomEntryQuery.gql';
+  import ROOM_ENTRY_QUERY from '@/graphql/gql/queries/roomEntryQuery.gql';
 
   export default {
     components: {
diff --git a/client/src/pages/createClass.vue b/client/src/pages/createClass.vue
index c482e9f0..cd55b31f 100644
--- a/client/src/pages/createClass.vue
+++ b/client/src/pages/createClass.vue
@@ -16,7 +16,7 @@
   import addSchoolClassMixin from '@/mixins/add-school-class';
 
   import CREATE_CLASS_MUTATION from '@/graphql/gql/mutations/createClass.gql';
-  import MY_SCHOOL_CLASS_QUERY from '@/graphql/gql/mySchoolClass';
+  import MY_SCHOOL_CLASS_QUERY from '@/graphql/gql/queries/mySchoolClass';
   import JoinForm from '@/components/profile/JoinForm';
 
   export default {
diff --git a/client/src/pages/editRoom.vue b/client/src/pages/editRoom.vue
index d92755f7..cabf8aaf 100644
--- a/client/src/pages/editRoom.vue
+++ b/client/src/pages/editRoom.vue
@@ -10,7 +10,7 @@
   // todo: refactor this, we don't need 2 components, remove editRoom or EditRoom component
   import EditRoom from '@/components/rooms/EditRoom';
 
-  import ROOM_QUERY from '@/graphql/gql/roomQuery.gql';
+  import ROOM_QUERY from '@/graphql/gql/queries/roomQuery.gql';
 
   export default {
     props: ['id'],
diff --git a/client/src/pages/index.vue b/client/src/pages/index.vue
index 63f34efb..2adfef74 100644
--- a/client/src/pages/index.vue
+++ b/client/src/pages/index.vue
@@ -19,7 +19,7 @@
 </template>
 
 <script>
-  import ALL_MODULES from '@/graphql/gql/allModules.gql';
+  import ALL_MODULES from '@/graphql/gql/queries/allModules.gql';
 
   export default {
     data() {
diff --git a/client/src/pages/instrument.vue b/client/src/pages/instrument.vue
index 23a9603e..92fedc6e 100644
--- a/client/src/pages/instrument.vue
+++ b/client/src/pages/instrument.vue
@@ -20,7 +20,7 @@
 </template>
 
 <script>
-  import INSTRUMENT_QUERY from '@/graphql/gql/instrumentQuery.gql';
+  import INSTRUMENT_QUERY from '@/graphql/gql/queries/instrumentQuery.gql';
 
   import ContentComponent from '@/components/content-blocks/ContentComponent';
 
diff --git a/client/src/pages/instrumentOverview.vue b/client/src/pages/instrumentOverview.vue
index a1a68b47..0ed95fe1 100644
--- a/client/src/pages/instrumentOverview.vue
+++ b/client/src/pages/instrumentOverview.vue
@@ -23,7 +23,7 @@
 
 <script>
   import InstrumentFilter from '@/components/instruments/InstrumentFilter';
-  import INSTRUMENTS_QUERY from '@/graphql/gql/instrumentsQuery.gql';
+  import INSTRUMENTS_QUERY from '@/graphql/gql/queries/instrumentsQuery.gql';
 
   export default {
     components: {
diff --git a/client/src/pages/joinClass.vue b/client/src/pages/joinClass.vue
index 2220b22c..7676acaf 100644
--- a/client/src/pages/joinClass.vue
+++ b/client/src/pages/joinClass.vue
@@ -12,7 +12,7 @@
 
 <script>
   import JOIN_CLASS_MUTATION from '@/graphql/gql/mutations/joinClass.gql';
-  import MY_SCHOOL_CLASS_QUERY from '@/graphql/gql/mySchoolClass';
+  import MY_SCHOOL_CLASS_QUERY from '@/graphql/gql/queries/mySchoolClass';
 
   import addSchoolClass from '@/mixins/add-school-class';
   import logout from '@/mixins/logout';
diff --git a/client/src/pages/license-activation.vue b/client/src/pages/license-activation.vue
index da0263f9..0f4fe6b6 100644
--- a/client/src/pages/license-activation.vue
+++ b/client/src/pages/license-activation.vue
@@ -70,7 +70,7 @@
 <script>
 
 import REDEEM_COUPON from '@/graphql/gql/mutations/redeemCoupon.gql';
-import ME_QUERY from '@/graphql/gql/meQuery.gql';
+import ME_QUERY from '@/graphql/gql/queries/meQuery.gql';
 import LoadingButton from '@/components/LoadingButton';
 
 import me from '@/mixins/me';
diff --git a/client/src/pages/me/joinTeam.vue b/client/src/pages/me/joinTeam.vue
index 6e8dcfa5..4c3b3485 100644
--- a/client/src/pages/me/joinTeam.vue
+++ b/client/src/pages/me/joinTeam.vue
@@ -12,7 +12,7 @@
 
 <script>
   import JOIN_TEAM_MUTATION from '@/graphql/gql/mutations/joinTeam.gql';
-  import ME_QUERY from '@/graphql/gql/meQuery.gql';
+  import ME_QUERY from '@/graphql/gql/queries/meQuery.gql';
 
   import JoinForm from '@/components/profile/JoinForm';
   import {MY_TEAM} from '@/router/me.names';
diff --git a/client/src/pages/module/module.vue b/client/src/pages/module/module.vue
index 2a44ce4b..91643b76 100644
--- a/client/src/pages/module/module.vue
+++ b/client/src/pages/module/module.vue
@@ -56,7 +56,7 @@
 
   import BookmarkActions from '@/components/notes/BookmarkActions';
   import meMixin from '@/mixins/me';
-  import MODULE_DETAILS_QUERY from '@/graphql/gql/moduleDetailsQuery';
+  import MODULE_DETAILS_QUERY from '@/graphql/gql/queries/moduleDetailsQuery';
 
   export default {
     mixins: [meMixin],
diff --git a/client/src/pages/module/moduleRoom.vue b/client/src/pages/module/moduleRoom.vue
index c4476e66..910bcff9 100644
--- a/client/src/pages/module/moduleRoom.vue
+++ b/client/src/pages/module/moduleRoom.vue
@@ -28,8 +28,8 @@
 </template>
 
 <script>
-  import MODULE_ROOM_ENTRIES_QUERY from '@/graphql/gql/moduleRoomEntryQuery.gql';
-  import ME_QUERY from '@/graphql/gql/meQuery.gql';
+  import MODULE_ROOM_ENTRIES_QUERY from '@/graphql/gql/queries/moduleRoomEntryQuery.gql';
+  import ME_QUERY from '@/graphql/gql/queries/meQuery.gql';
   import roomMixin from '@/mixins/room';
 
   export default {
diff --git a/client/src/pages/module/moduleVisibility.vue b/client/src/pages/module/moduleVisibility.vue
index 2db26c4b..29a508b3 100644
--- a/client/src/pages/module/moduleVisibility.vue
+++ b/client/src/pages/module/moduleVisibility.vue
@@ -43,7 +43,7 @@
   import me from '@/mixins/me';
 
   import SYNC_VISIBILITY_MUTATION from '@/graphql/gql/mutations/syncModuleVisibility.gql';
-  import MODULE_DETAILS_QUERY from '@/graphql/gql/moduleDetailsQuery';
+  import MODULE_DETAILS_QUERY from '@/graphql/gql/queries/moduleDetailsQuery';
   import {MODULE_PAGE} from '@/router/module.names';
 
   export default {
diff --git a/client/src/pages/myClass.vue b/client/src/pages/myClass.vue
index fdac4f89..76f9d55f 100644
--- a/client/src/pages/myClass.vue
+++ b/client/src/pages/myClass.vue
@@ -18,7 +18,7 @@
 <script>
   import GroupList from '@/components/profile/GroupList';
 
-  import MY_SCHOOL_CLASS_QUERY from '@/graphql/gql/mySchoolClass.gql';
+  import MY_SCHOOL_CLASS_QUERY from '@/graphql/gql/queries/mySchoolClass.gql';
   import ADD_REMOVE_MEMBER_MUTATION from '@/graphql/gql/mutations/addRemoveMember.gql';
   import selectedClassMixin from '@/mixins/selected-class';
   import {SHOW_SCHOOL_CLASS_CODE} from '@/router/me.names';
diff --git a/client/src/pages/newRoom.vue b/client/src/pages/newRoom.vue
index 2065995a..8fa06c85 100644
--- a/client/src/pages/newRoom.vue
+++ b/client/src/pages/newRoom.vue
@@ -9,7 +9,7 @@
   import RoomForm from '@/components/rooms/RoomForm';
 
   import ADD_ROOM_MUTATION from '@/graphql/gql/mutations/addRoom.gql';
-  import ROOMS_QUERY from '@/graphql/gql/roomsQuery.gql';
+  import ROOMS_QUERY from '@/graphql/gql/queries/roomsQuery.gql';
 
   const defaultAppearance = 'blue';
 
diff --git a/client/src/pages/oldClasses.vue b/client/src/pages/oldClasses.vue
index 2ab75896..0518d4b5 100644
--- a/client/src/pages/oldClasses.vue
+++ b/client/src/pages/oldClasses.vue
@@ -16,7 +16,7 @@
 </template>
 
 <script>
-  import OLD_CLASSES_QUERY from '@/graphql/gql/oldClasses.gql';
+  import OLD_CLASSES_QUERY from '@/graphql/gql/queries/oldClasses.gql';
 
   import updateSelectedClassMixin from '@/mixins/update-selected-class';
 
diff --git a/client/src/pages/onboarding.vue b/client/src/pages/onboarding.vue
index cd81cfbe..e4e41e3d 100644
--- a/client/src/pages/onboarding.vue
+++ b/client/src/pages/onboarding.vue
@@ -26,7 +26,7 @@
   import RoomsIllustration from '@/components/illustrations/RoomsIllustration';
 
   import UPDATE_ONBOARDING_PROGRESS from '@/graphql/gql/mutations/updateOnboardingProgress.gql';
-  import ME_QUERY from '@/graphql/gql/meQuery';
+  import ME_QUERY from '@/graphql/gql/queries/meQuery';
 
   export default {
     components: {
diff --git a/client/src/pages/portfolio/editProject.vue b/client/src/pages/portfolio/editProject.vue
index 101b4ec9..0b4e74f8 100644
--- a/client/src/pages/portfolio/editProject.vue
+++ b/client/src/pages/portfolio/editProject.vue
@@ -10,7 +10,7 @@
   // todo: refactor this, we don't need 2 components, remove editRoom or EditRoom component
   import EditProject from '@/components/portfolio/EditProject';
 
-  import PROJECT_QUERY from '@/graphql/gql/projectQuery.gql';
+  import PROJECT_QUERY from '@/graphql/gql/queries/projectQuery.gql';
 
   export default {
     props: ['id'],
diff --git a/client/src/pages/portfolio/newProject.vue b/client/src/pages/portfolio/newProject.vue
index 24bb25cd..1cb7ba92 100644
--- a/client/src/pages/portfolio/newProject.vue
+++ b/client/src/pages/portfolio/newProject.vue
@@ -9,7 +9,7 @@
   import ProjectForm from '@/components/portfolio/ProjectForm';
 
   import ADD_PROJECT_MUTATION from '@/graphql/gql/mutations/addProject.gql';
-  import PROJECTS_QUERY from '@/graphql/gql/allProjects.gql';
+  import PROJECTS_QUERY from '@/graphql/gql/queries/allProjects.gql';
 
   const defaultAppearance = 'blue';
 
diff --git a/client/src/pages/portfolio/portfolio.vue b/client/src/pages/portfolio/portfolio.vue
index 2854b4e7..1356d934 100644
--- a/client/src/pages/portfolio/portfolio.vue
+++ b/client/src/pages/portfolio/portfolio.vue
@@ -18,8 +18,8 @@
   import ProjectWidget from '@/components/portfolio/ProjectWidget';
   import AddProject from '@/components/portfolio/AddProject';
 
-  import ME_QUERY from '@/graphql/gql/meQuery.gql';
-  import PROJECTS_QUERY from '@/graphql/gql/allProjects.gql';
+  import ME_QUERY from '@/graphql/gql/queries/meQuery.gql';
+  import PROJECTS_QUERY from '@/graphql/gql/queries/allProjects.gql';
 
   export default {
     components: {
diff --git a/client/src/pages/portfolio/project.vue b/client/src/pages/portfolio/project.vue
index 968793ed..aeef749d 100644
--- a/client/src/pages/portfolio/project.vue
+++ b/client/src/pages/portfolio/project.vue
@@ -45,8 +45,8 @@
   import EntryCountWidget from '@/components/rooms/EntryCountWidget';
   import OwnerWidget from '@/components/portfolio/OwnerWidget';
 
-  import ME_QUERY from '@/graphql/gql/meQuery.gql';
-  import PROJECT_QUERY from '@/graphql/gql/projectQuery.gql';
+  import ME_QUERY from '@/graphql/gql/queries/meQuery.gql';
+  import PROJECT_QUERY from '@/graphql/gql/queries/projectQuery.gql';
 
   export default {
     props: ['slug'],
diff --git a/client/src/pages/room.vue b/client/src/pages/room.vue
index 9d50689e..d1feecce 100644
--- a/client/src/pages/room.vue
+++ b/client/src/pages/room.vue
@@ -29,7 +29,7 @@
 </template>
 
 <script>
-  import ROOM_ENTRIES_QUERY from '@/graphql/gql/roomEntriesQuery.gql';
+  import ROOM_ENTRIES_QUERY from '@/graphql/gql/queries/roomEntriesQuery.gql';
   import roomMixin from '@/mixins/room';
 
   export default {
diff --git a/client/src/pages/rooms.vue b/client/src/pages/rooms.vue
index c4e23be7..8b85aaef 100644
--- a/client/src/pages/rooms.vue
+++ b/client/src/pages/rooms.vue
@@ -12,8 +12,8 @@
 </template>
 
 <script>
-  import ROOMS_QUERY from '@/graphql/gql/roomsQuery.gql';
-  import ME_QUERY from '@/graphql/gql/meQuery.gql';
+  import ROOMS_QUERY from '@/graphql/gql/queries/roomsQuery.gql';
+  import ME_QUERY from '@/graphql/gql/queries/meQuery.gql';
 
   import RoomWidget from '@/components/rooms/RoomWidget.vue';
   import AddRoom from '@/components/rooms/AddRoom.vue';
diff --git a/client/src/pages/snapshot/snapshot.vue b/client/src/pages/snapshot/snapshot.vue
new file mode 100644
index 00000000..7fbb2fc2
--- /dev/null
+++ b/client/src/pages/snapshot/snapshot.vue
@@ -0,0 +1,29 @@
+<template>
+  <div>
+    Hello
+    {{ id }}
+  </div>
+</template>
+
+<script>
+  import SNAPSHOT_DETAIL_QUERY from 'gql/queries/snapshots/details.gql';
+
+  export default {
+    props: {
+      id: {
+        type: String,
+        default: '',
+      },
+    },
+
+    apollo: {
+      snapshot: SNAPSHOT_DETAIL_QUERY,
+    },
+
+  };
+</script>
+
+<style scoped lang="scss">
+  @import '~styles/helpers';
+
+</style>
diff --git a/client/src/pages/snapshot/snapshots.vue b/client/src/pages/snapshot/snapshots.vue
index 1b57936b..c03c8adc 100644
--- a/client/src/pages/snapshot/snapshots.vue
+++ b/client/src/pages/snapshot/snapshots.vue
@@ -15,7 +15,7 @@
 <script>
   import SnapshotListItem from '@/components/modules/SnapshotListItem';
 
-  import MODULE_SNAPSHOTS_QUERY from '@/graphql/gql/moduleSnapshots.gql';
+  import MODULE_SNAPSHOTS_QUERY from '@/graphql/gql/queries/moduleSnapshots.gql';
 
   const defaultModule = {topic: {}, snapshots: []};
 
diff --git a/client/src/pages/studentSubmission.vue b/client/src/pages/studentSubmission.vue
index 9c9adb06..f14b8d76 100644
--- a/client/src/pages/studentSubmission.vue
+++ b/client/src/pages/studentSubmission.vue
@@ -50,7 +50,7 @@
   import cloneDeep from 'lodash/cloneDeep';
 
   import StudentSubmissionDocument from '@/components/StudentSubmissionDocument';
-  import STUDENT_SUBMISSIONS_QUERY from '@/graphql/gql/studentSubmissionQuery.gql';
+  import STUDENT_SUBMISSIONS_QUERY from '@/graphql/gql/queries/studentSubmissionQuery.gql';
   import UPDATE_FEEDBACK_MUTATION from '@/graphql/gql/mutations/updateFeedback.gql';
   import UPDATE_FEEDBACK_WITH_TEXT_MUTATION from '@/graphql/gql/mutations/updateFeedbackWithText.gql';
   import SubmissionForm from '@/components/content-blocks/assignment/SubmissionForm';
diff --git a/client/src/pages/submissions.vue b/client/src/pages/submissions.vue
index 8553f305..db031eab 100644
--- a/client/src/pages/submissions.vue
+++ b/client/src/pages/submissions.vue
@@ -11,7 +11,7 @@
 
 <script>
   import AssignmentWithSubmissions from '@/components/AssignmentWithSubmissions';
-  import ASSIGNMENT_WITH_SUBMISSIONS_QUERY from '@/graphql/gql/assignmentWithSubmissionsQuery.gql';
+  import ASSIGNMENT_WITH_SUBMISSIONS_QUERY from '@/graphql/gql/queries/assignmentWithSubmissionsQuery.gql';
 
   export default {
     components: {
diff --git a/client/src/pages/survey.vue b/client/src/pages/survey.vue
index 1594cf9c..cc21caf6 100644
--- a/client/src/pages/survey.vue
+++ b/client/src/pages/survey.vue
@@ -18,8 +18,8 @@
   import * as SurveyVue from 'survey-vue';
   import {css} from '@/survey.config';
 
-  import SURVEY_QUERY from '@/graphql/gql/surveyQuery.gql';
-  import MODULE_QUERY from '@/graphql/gql/moduleByIdQuery.gql';
+  import SURVEY_QUERY from '@/graphql/gql/queries/surveyQuery.gql';
+  import MODULE_QUERY from '@/graphql/gql/queries/moduleByIdQuery.gql';
   import UPDATE_ANSWER from '@/graphql/gql/mutations/updateAnswer.gql';
   import Solution from '@/components/content-blocks/Solution';
 
diff --git a/client/src/pages/test.vue b/client/src/pages/test.vue
new file mode 100644
index 00000000..06c80e73
--- /dev/null
+++ b/client/src/pages/test.vue
@@ -0,0 +1,77 @@
+<template>
+  <div>
+    <button @click="makeQuery">Normal Query</button>
+    <pre>
+    {{ module }}
+    </pre>
+
+  </div>
+</template>
+
+<script>
+  import gql from 'graphql-tag';
+  // import MODULE_DETAILS_QUERY from '@/graphql/gql/moduleDetailsQuery.gql';
+  // import MODULE_PARTS from '@/graphql/gql/fragments/moduleParts.gql';
+
+  const moduleParts = gql`
+fragment ModuleParts on ModuleNode {
+  id
+  title
+}
+
+`;
+
+  const moduleQuery = gql`
+${moduleParts}
+query ModuleQuery {
+    module(slug: "lohn-und-budget") {
+        ...ModuleParts
+    }
+}
+
+`;
+
+  const moduleAndObjectivesQuery = gql`
+${moduleParts}
+query ModuleQuery {
+    module(slug: "lohn-und-budget") {
+        ...ModuleParts
+        objectiveGroups {
+        edges {
+          node {
+            id
+          }
+        }
+    }
+    }
+}
+
+`;
+
+  export default {
+    data() {
+      return {
+        objectiveGroups: {},
+        module: {},
+      };
+    },
+
+    methods: {
+      makeQuery() {
+        console.log('click');
+        this.$apollo.query({query: moduleQuery});
+      },
+    },
+
+    apollo: {
+      // me: ME_QUERY
+      // objectiveGroups: gql,
+      module: moduleAndObjectivesQuery,
+    },
+  };
+</script>
+
+<style scoped lang="scss">
+  @import '~styles/helpers';
+
+</style>
diff --git a/client/src/pages/topic.vue b/client/src/pages/topic.vue
index a48f1dfc..6ccbd8bf 100644
--- a/client/src/pages/topic.vue
+++ b/client/src/pages/topic.vue
@@ -43,12 +43,12 @@
   import ModuleTeaser from '@/components/modules/ModuleTeaser.vue';
   import PlayIcon from '@/components/icons/Play';
   import BulbIcon from '@/components/icons/BulbIcon';
-  import TOPIC_QUERY from '@/graphql/gql/topicQuery.gql';
+  import TOPIC_QUERY from '@/graphql/gql/queries/topicQuery.gql';
   import me from '@/mixins/me';
   import BookTopicNavigation from '@/components/book-navigation/BookTopicNavigation';
 
   import UPDATE_LAST_TOPIC_MUTATION from '@/graphql/gql/mutations/updateLastTopic.gql';
-  import ME_QUERY from '@/graphql/gql/meQuery.gql';
+  import ME_QUERY from '@/graphql/gql/queries/meQuery.gql';
 
   export default {