diff --git a/extension/src/fileSystem/tree.ts b/extension/src/fileSystem/tree.ts
index 979c06e087..da3fb28f83 100644
--- a/extension/src/fileSystem/tree.ts
+++ b/extension/src/fileSystem/tree.ts
@@ -24,7 +24,7 @@ import { getWarningResponse } from '../vscode/modal'
 import { Response } from '../vscode/response'
 import { Resource } from '../repository/commands'
 import { WorkspaceRepositories } from '../repository/workspace'
-import { PathItem } from '../repository/collect'
+import { PathItem } from '../repository/data/collect'
 
 export class TrackedExplorerTree implements TreeDataProvider<PathItem> {
   public readonly dispose = Disposable.fn()
diff --git a/extension/src/repository/collect.test.ts b/extension/src/repository/data/collect.test.ts
similarity index 99%
rename from extension/src/repository/collect.test.ts
rename to extension/src/repository/data/collect.test.ts
index d8462439f8..1276e9d11b 100644
--- a/extension/src/repository/collect.test.ts
+++ b/extension/src/repository/data/collect.test.ts
@@ -1,7 +1,7 @@
 import { join } from 'path'
 import { Uri } from 'vscode'
 import { collectTree } from './collect'
-import { dvcDemoPath } from '../test/util'
+import { dvcDemoPath } from '../../test/util'
 
 describe('collectTree', () => {
   const makeUri = (...paths: string[]): Uri =>
diff --git a/extension/src/repository/collect.ts b/extension/src/repository/data/collect.ts
similarity index 93%
rename from extension/src/repository/collect.ts
rename to extension/src/repository/data/collect.ts
index 4f37204594..3c3041ec0e 100644
--- a/extension/src/repository/collect.ts
+++ b/extension/src/repository/data/collect.ts
@@ -1,7 +1,7 @@
 import { join, sep } from 'path'
 import { Uri } from 'vscode'
-import { Resource } from './commands'
-import { addToMapSet } from '../util/map'
+import { Resource } from '../commands'
+import { addToMapSet } from '../../util/map'
 
 export type PathItem = Resource & {
   isDirectory: boolean
diff --git a/extension/src/repository/data.ts b/extension/src/repository/data/index.ts
similarity index 90%
rename from extension/src/repository/data.ts
rename to extension/src/repository/data/index.ts
index 1a92cc48cb..3a6bcdc0fe 100644
--- a/extension/src/repository/data.ts
+++ b/extension/src/repository/data/index.ts
@@ -1,11 +1,11 @@
 import { Event, EventEmitter } from 'vscode'
 import { Disposable } from '@hediet/std/disposable'
 import { Deferred } from '@hediet/std/synchronization'
-import { AvailableCommands, InternalCommands } from '../commands/internal'
-import { DiffOutput, ListOutput, StatusOutput } from '../cli/reader'
-import { isAnyDvcYaml } from '../fileSystem'
-import { getAllUntracked } from '../git'
-import { ProcessManager } from '../processManager'
+import { AvailableCommands, InternalCommands } from '../../commands/internal'
+import { DiffOutput, ListOutput, StatusOutput } from '../../cli/reader'
+import { isAnyDvcYaml } from '../../fileSystem'
+import { getAllUntracked } from '../../git'
+import { ProcessManager } from '../../processManager'
 
 export type Data = {
   diffFromHead: DiffOutput
diff --git a/extension/src/repository/model.test.ts b/extension/src/repository/model/index.test.ts
similarity index 98%
rename from extension/src/repository/model.test.ts
rename to extension/src/repository/model/index.test.ts
index 074d0bb682..8442ad14a6 100644
--- a/extension/src/repository/model.test.ts
+++ b/extension/src/repository/model/index.test.ts
@@ -1,9 +1,9 @@
 import { join, resolve, sep } from 'path'
 import { Disposable, Disposer } from '@hediet/std/disposable'
 import { mocked } from 'ts-jest/utils'
-import { RepositoryModel } from './model'
-import { ListOutput, StatusOutput } from '../cli/reader'
-import { dvcDemoPath } from '../test/util'
+import { RepositoryModel } from '.'
+import { ListOutput, StatusOutput } from '../../cli/reader'
+import { dvcDemoPath } from '../../test/util'
 
 jest.mock('@hediet/std/disposable')
 
diff --git a/extension/src/repository/model.ts b/extension/src/repository/model/index.ts
similarity index 96%
rename from extension/src/repository/model.ts
rename to extension/src/repository/model/index.ts
index 097da247d3..9f8174c140 100644
--- a/extension/src/repository/model.ts
+++ b/extension/src/repository/model/index.ts
@@ -1,9 +1,9 @@
 import { dirname, resolve } from 'path'
 import isEqual from 'lodash.isequal'
 import { Disposable } from '@hediet/std/disposable'
-import { collectTree, PathItem } from './collect'
-import { SourceControlManagementModel } from './sourceControlManagement'
-import { DecorationModel } from './decorationProvider'
+import { collectTree, PathItem } from '../data/collect'
+import { SourceControlManagementModel } from '../sourceControlManagement'
+import { DecorationModel } from '../decorationProvider'
 import {
   ChangedType,
   DiffOutput,
@@ -14,8 +14,8 @@ import {
   Status,
   StatusesOrAlwaysChanged,
   StatusOutput
-} from '../cli/reader'
-import { isDirectory } from '../fileSystem'
+} from '../../cli/reader'
+import { isDirectory } from '../../fileSystem'
 
 type OutputData = {
   diffFromCache: StatusOutput
diff --git a/extension/src/test/suite/repository/data.test.ts b/extension/src/test/suite/repository/data/index.test.ts
similarity index 96%
rename from extension/src/test/suite/repository/data.test.ts
rename to extension/src/test/suite/repository/data/index.test.ts
index 5691d586c1..8c812baa3c 100644
--- a/extension/src/test/suite/repository/data.test.ts
+++ b/extension/src/test/suite/repository/data/index.test.ts
@@ -2,9 +2,9 @@ import { join } from 'path'
 import { afterEach, beforeEach, describe, it, suite } from 'mocha'
 import { expect } from 'chai'
 import { restore } from 'sinon'
-import { buildRepositoryData } from './util'
-import { Disposable } from '../../../extension'
-import { dvcDemoPath } from '../../util'
+import { buildRepositoryData } from '../util'
+import { Disposable } from '../../../../extension'
+import { dvcDemoPath } from '../../../util'
 
 suite('Repository Data Test Suite', () => {
   const disposable = Disposable.fn()