diff --git a/src/Action/ActionController.ts b/src/Action/ActionController.ts
index d8c7a4e..faccd19 100644
--- a/src/Action/ActionController.ts
+++ b/src/Action/ActionController.ts
@@ -4,7 +4,7 @@ import { grabActiveVillageId } from '../Page/VillageBlock';
 import { Args } from '../Queue/Args';
 import { Task } from '../Queue/TaskProvider';
 import { VillageStorage } from '../Storage/VillageStorage';
-import { VillageFactory } from '../VillageFactory';
+import { VillageFactory } from '../Village/VillageFactory';
 import { aroundMinutes } from '../Helpers/Time';
 
 const actionMap: { [name: string]: Function | undefined } = {};
diff --git a/src/Action/FindSendResourcesPath.ts b/src/Action/FindSendResourcesPath.ts
index 9d18c97..53e0a3d 100644
--- a/src/Action/FindSendResourcesPath.ts
+++ b/src/Action/FindSendResourcesPath.ts
@@ -5,14 +5,14 @@ import { Coordinates } from '../Core/Village';
 import { Args } from '../Queue/Args';
 import { Task } from '../Queue/TaskProvider';
 import { clickSendButton, fillSendResourcesForm } from '../Page/BuildingPage/MarketPage';
-import { VillageState } from '../VillageState';
+import { VillageState } from '../Village/VillageState';
 import { MerchantsInfo } from '../Core/Market';
 import { goToMarketSendResourcesPage, goToResourceViewPage } from '../Task/ActionBundles';
 import {
     compareReports,
     ResourceTransferCalculator,
     ResourceTransferReport,
-} from '../ResourceTransfer';
+} from '../Village/ResourceTransfer';
 import { ResourceTransferStorage } from '../Storage/ResourceTransferStorage';
 import { path } from '../Helpers/Path';
 import { MARKET_ID } from '../Core/Buildings';
diff --git a/src/Action/SendResourcesAction.ts b/src/Action/SendResourcesAction.ts
index 46e85c1..ae784da 100644
--- a/src/Action/SendResourcesAction.ts
+++ b/src/Action/SendResourcesAction.ts
@@ -2,7 +2,7 @@ import { ActionController, registerAction } from './ActionController';
 import { Args } from '../Queue/Args';
 import { Task } from '../Queue/TaskProvider';
 import { clickSendButton, fillSendResourcesForm } from '../Page/BuildingPage/MarketPage';
-import { ResourceTransferCalculator } from '../ResourceTransfer';
+import { ResourceTransferCalculator } from '../Village/ResourceTransfer';
 import { ResourceTransferStorage } from '../Storage/ResourceTransferStorage';
 import { Resources } from '../Core/Resources';
 import { AbortTaskError } from '../Errors';
diff --git a/src/Container.ts b/src/Container.ts
index c93a6a9..3ae0861 100644
--- a/src/Container.ts
+++ b/src/Container.ts
@@ -6,8 +6,8 @@ import { Executor } from './Executor';
 import { ControlPanel } from './ControlPanel';
 import { DataStorageTaskProvider } from './Queue/DataStorageTaskProvider';
 import { Statistics } from './Statistics';
-import { VillageRepository } from './VillageRepository';
-import { VillageFactory } from './VillageFactory';
+import { VillageRepository } from './Village/VillageRepository';
+import { VillageFactory } from './Village/VillageFactory';
 import { GrabberManager } from './Grabber/GrabberManager';
 import { StorageContainer } from './Storage/StorageContainer';
 
diff --git a/src/ControlPanel.ts b/src/ControlPanel.ts
index 6838ac0..dbaea54 100644
--- a/src/ControlPanel.ts
+++ b/src/ControlPanel.ts
@@ -11,15 +11,15 @@ import {
 import Vue from 'vue';
 import Vuex from 'vuex';
 import DashboardApp from './DashboardView/Dashboard.vue';
+import { createStore } from './DashboardView/Store';
 import { ConsoleLogger, Logger } from './Logger';
 import { DataStorage } from './Storage/DataStorage';
 import { getBuildingPageAttributes, isBuildingPage } from './Page/PageDetector';
 import { ExecutionStorage } from './Storage/ExecutionStorage';
-import { VillageState } from './VillageState';
+import { VillageState } from './Village/VillageState';
 import { Task } from './Queue/TaskProvider';
 import { Action } from './Queue/ActionQueue';
-import { createStore } from './DashboardView/Store';
-import { VillageFactory } from './VillageFactory';
+import { VillageFactory } from './Village/VillageFactory';
 import { uniqId } from './Helpers/Identity';
 import { timestamp } from './Helpers/Time';
 import { notify, parseLocation, waitForLoad } from './Helpers/Browser';
diff --git a/src/DashboardView/Store.ts b/src/DashboardView/Store.ts
index f9248af..3b0d174 100644
--- a/src/DashboardView/Store.ts
+++ b/src/DashboardView/Store.ts
@@ -1,7 +1,7 @@
 import Vuex from 'vuex';
 import { VillageSettings, VillageSettingsDefaults } from '../Core/Village';
 import { VillageStorage } from '../Storage/VillageStorage';
-import { VillageFactory } from '../VillageFactory';
+import { VillageFactory } from '../Village/VillageFactory';
 import { StorageContainer } from '../Storage/StorageContainer';
 import { getNumber } from '../Helpers/Convert';
 import { notify } from '../Helpers/Browser';
diff --git a/src/Executor.ts b/src/Executor.ts
index bbe55f1..8a4d05e 100644
--- a/src/Executor.ts
+++ b/src/Executor.ts
@@ -16,7 +16,7 @@ import { ExecutionStorage } from './Storage/ExecutionStorage';
 import { Action } from './Queue/ActionQueue';
 import { Task } from './Queue/TaskProvider';
 import { createTaskHandler } from './Task/TaskMap';
-import { VillageFactory } from './VillageFactory';
+import { VillageFactory } from './Village/VillageFactory';
 import { sleepMicro, timestamp } from './Helpers/Time';
 import { markPage, waitForLoad } from './Helpers/Browser';
 
diff --git a/src/Grabber/Grabber.ts b/src/Grabber/Grabber.ts
index 8919e93..a24138b 100644
--- a/src/Grabber/Grabber.ts
+++ b/src/Grabber/Grabber.ts
@@ -1,4 +1,4 @@
-import { VillageTaskCollection } from '../VillageTaskCollection';
+import { VillageTaskCollection } from '../Village/VillageTaskCollection';
 import { VillageStorage } from '../Storage/VillageStorage';
 
 export abstract class Grabber {
diff --git a/src/Grabber/GrabberManager.ts b/src/Grabber/GrabberManager.ts
index 8861aa9..859c71b 100644
--- a/src/Grabber/GrabberManager.ts
+++ b/src/Grabber/GrabberManager.ts
@@ -6,7 +6,7 @@ import { MarketPageGrabber } from './MarketPageGrabber';
 import { BuildingContractGrabber } from './BuildingContractGrabber';
 import { ForgePageGrabber } from './ForgePageGrabber';
 import { GuildHallPageGrabber } from './GuildHallPageGrabber';
-import { VillageFactory } from '../VillageFactory';
+import { VillageFactory } from '../Village/VillageFactory';
 import { VillageBuildingsPageGrabber } from './VillageBuildingsPageGrabber';
 
 export class GrabberManager {
diff --git a/src/Page/BuildingPageController.ts b/src/Page/BuildingPageController.ts
index 6d4913c..b88d8f4 100644
--- a/src/Page/BuildingPageController.ts
+++ b/src/Page/BuildingPageController.ts
@@ -21,7 +21,7 @@ import { createResearchButtons } from './BuildingPage/ForgePage';
 import { ForgeImprovementTask } from '../Task/ForgeImprovementTask';
 import { createCelebrationButtons } from './BuildingPage/GuildHallPage';
 import { CelebrationTask } from '../Task/CelebrationTask';
-import { VillageController } from '../VillageController';
+import { VillageController } from '../Village/VillageController';
 import { notify } from '../Helpers/Browser';
 
 export class BuildingPageController {
diff --git a/src/Scheduler.ts b/src/Scheduler.ts
index 3250d38..9fab28a 100644
--- a/src/Scheduler.ts
+++ b/src/Scheduler.ts
@@ -7,8 +7,8 @@ import { UpdateResourceContracts } from './Task/UpdateResourceContracts';
 import { SendResourcesTask } from './Task/SendResourcesTask';
 import { Args } from './Queue/Args';
 import { ImmutableTaskList, Task, TaskId, uniqTaskId, withTime } from './Queue/TaskProvider';
-import { VillageRepositoryInterface } from './VillageRepository';
-import { VillageFactory } from './VillageFactory';
+import { VillageRepositoryInterface } from './Village/VillageRepository';
+import { VillageFactory } from './Village/VillageFactory';
 import { RunVillageProductionTask } from './Task/RunVillageProductionTask';
 import { isProductionTask } from './Task/TaskMap';
 import { around } from './Helpers/Random';
diff --git a/src/Storage/ResourceTransferStorage.ts b/src/Storage/ResourceTransferStorage.ts
index 587dcef..7316896 100644
--- a/src/Storage/ResourceTransferStorage.ts
+++ b/src/Storage/ResourceTransferStorage.ts
@@ -1,5 +1,5 @@
 import { DataStorage } from './DataStorage';
-import { ResourceTransferReport } from '../ResourceTransfer';
+import { ResourceTransferReport } from '../Village/ResourceTransfer';
 
 const NAMESPACE = 'resource_transfer.v1';
 
diff --git a/src/Task/TaskController.ts b/src/Task/TaskController.ts
index 2ddbe4f..4c69d67 100644
--- a/src/Task/TaskController.ts
+++ b/src/Task/TaskController.ts
@@ -3,7 +3,7 @@ import { CompleteTaskAction } from '../Action/CompleteTaskAction';
 import { Action } from '../Queue/ActionQueue';
 import { Args } from '../Queue/Args';
 import { Task } from '../Queue/TaskProvider';
-import { VillageFactory } from '../VillageFactory';
+import { VillageFactory } from '../Village/VillageFactory';
 
 export interface ActionDefinition {
     name: string;
diff --git a/src/Task/TaskMap.ts b/src/Task/TaskMap.ts
index d91f815..4bf3021 100644
--- a/src/Task/TaskMap.ts
+++ b/src/Task/TaskMap.ts
@@ -5,7 +5,7 @@ import {
     ProductionQueue,
     TaskNamePredicate,
 } from '../Core/ProductionQueue';
-import { VillageFactory } from '../VillageFactory';
+import { VillageFactory } from '../Village/VillageFactory';
 
 interface TaskOptions {
     queue?: ProductionQueue;
diff --git a/src/ResourceTransfer.ts b/src/Village/ResourceTransfer.ts
similarity index 97%
rename from src/ResourceTransfer.ts
rename to src/Village/ResourceTransfer.ts
index 26e142e..57b526c 100644
--- a/src/ResourceTransfer.ts
+++ b/src/Village/ResourceTransfer.ts
@@ -1,5 +1,5 @@
 import { VillageFactory } from './VillageFactory';
-import { Resources, ResourcesInterface } from './Core/Resources';
+import { Resources, ResourcesInterface } from '../Core/Resources';
 import { VillageController } from './VillageController';
 
 export interface ResourceTransferScore {
diff --git a/src/VillageController.ts b/src/Village/VillageController.ts
similarity index 93%
rename from src/VillageController.ts
rename to src/Village/VillageController.ts
index 9308b09..6ff6d97 100644
--- a/src/VillageController.ts
+++ b/src/Village/VillageController.ts
@@ -1,15 +1,15 @@
 import { VillageTaskCollection } from './VillageTaskCollection';
-import { isBuildingPlanned, TaskId } from './Queue/TaskProvider';
-import { Args } from './Queue/Args';
+import { isBuildingPlanned, TaskId } from '../Queue/TaskProvider';
+import { Args } from '../Queue/Args';
 import { TaskState, VillageState } from './VillageState';
-import { Resources } from './Core/Resources';
-import { MerchantsInfo } from './Core/Market';
-import { VillageStorage } from './Storage/VillageStorage';
-import { ReceiveResourcesMode } from './Core/Village';
-import { ResourceType } from './Core/ResourceType';
-import { UpgradeBuildingTask } from './Task/UpgradeBuildingTask';
-import { GARNER_ID, WAREHOUSE_ID } from './Core/Buildings';
-import { first } from './Helpers/Collection';
+import { Resources } from '../Core/Resources';
+import { MerchantsInfo } from '../Core/Market';
+import { VillageStorage } from '../Storage/VillageStorage';
+import { ReceiveResourcesMode } from '../Core/Village';
+import { ResourceType } from '../Core/ResourceType';
+import { UpgradeBuildingTask } from '../Task/UpgradeBuildingTask';
+import { GARNER_ID, WAREHOUSE_ID } from '../Core/Buildings';
+import { first } from '../Helpers/Collection';
 
 export class VillageController {
     private readonly villageId: number;
diff --git a/src/VillageFactory.ts b/src/Village/VillageFactory.ts
similarity index 95%
rename from src/VillageFactory.ts
rename to src/Village/VillageFactory.ts
index efb1b4b..e7e58bd 100644
--- a/src/VillageFactory.ts
+++ b/src/Village/VillageFactory.ts
@@ -1,9 +1,9 @@
 import { VillageController } from './VillageController';
-import { VillageStorage } from './Storage/VillageStorage';
+import { VillageStorage } from '../Storage/VillageStorage';
 import { VillageRepository } from './VillageRepository';
 import { VillageTaskCollection } from './VillageTaskCollection';
 import { VillageState, VillageStateFactory } from './VillageState';
-import { Village } from './Core/Village';
+import { Village } from '../Core/Village';
 
 export class VillageFactory {
     private readonly villageRepository: VillageRepository;
diff --git a/src/VillageRepository.ts b/src/Village/VillageRepository.ts
similarity index 85%
rename from src/VillageRepository.ts
rename to src/Village/VillageRepository.ts
index fefe0fa..7fe5120 100644
--- a/src/VillageRepository.ts
+++ b/src/Village/VillageRepository.ts
@@ -1,6 +1,6 @@
-import { Coordinates, Village } from './Core/Village';
-import { grabVillageList } from './Page/VillageBlock';
-import { VillageNotFound } from './Errors';
+import { Coordinates, Village } from '../Core/Village';
+import { grabVillageList } from '../Page/VillageBlock';
+import { VillageNotFound } from '../Errors';
 
 export interface VillageRepositoryInterface {
     all(): Array<Village>;
diff --git a/src/VillageState.ts b/src/Village/VillageState.ts
similarity index 95%
rename from src/VillageState.ts
rename to src/Village/VillageState.ts
index 2584050..a29f0ea 100644
--- a/src/VillageState.ts
+++ b/src/Village/VillageState.ts
@@ -1,15 +1,15 @@
-import { Village, VillageSettings } from './Core/Village';
-import { Resources } from './Core/Resources';
-import { VillageStorage } from './Storage/VillageStorage';
-import { calcGatheringTimings, GatheringTime } from './Core/GatheringTimings';
+import { Village, VillageSettings } from '../Core/Village';
+import { Resources } from '../Core/Resources';
+import { VillageStorage } from '../Storage/VillageStorage';
+import { calcGatheringTimings, GatheringTime } from '../Core/GatheringTimings';
 import { VillageRepositoryInterface } from './VillageRepository';
-import { VillageNotFound } from './Errors';
-import { OrderedProductionQueues, ProductionQueue } from './Core/ProductionQueue';
-import { isInQueue, TaskCore, TaskId } from './Queue/TaskProvider';
+import { VillageNotFound } from '../Errors';
+import { OrderedProductionQueues, ProductionQueue } from '../Core/ProductionQueue';
+import { isInQueue, TaskCore, TaskId } from '../Queue/TaskProvider';
 import { VillageTaskCollection } from './VillageTaskCollection';
-import { TrainTroopTask } from './Task/TrainTroopTask';
-import { Args } from './Queue/Args';
-import { timestamp } from './Helpers/Time';
+import { TrainTroopTask } from '../Task/TrainTroopTask';
+import { Args } from '../Queue/Args';
+import { timestamp } from '../Helpers/Time';
 
 export interface TaskState {
     id: TaskId;
diff --git a/src/VillageTaskCollection.ts b/src/Village/VillageTaskCollection.ts
similarity index 87%
rename from src/VillageTaskCollection.ts
rename to src/Village/VillageTaskCollection.ts
index ceabc6a..30e9abd 100644
--- a/src/VillageTaskCollection.ts
+++ b/src/Village/VillageTaskCollection.ts
@@ -1,12 +1,12 @@
-import { VillageStorage } from './Storage/VillageStorage';
-import { Task, TaskId, uniqTaskId, withResources, withTime } from './Queue/TaskProvider';
-import { Args } from './Queue/Args';
-import { Resources } from './Core/Resources';
-import { ContractAttributes, ContractType } from './Core/Contract';
-import { UpgradeBuildingTask } from './Task/UpgradeBuildingTask';
-import { ForgeImprovementTask } from './Task/ForgeImprovementTask';
-import { isProductionTask } from './Task/TaskMap';
-import { timestamp } from './Helpers/Time';
+import { VillageStorage } from '../Storage/VillageStorage';
+import { Task, TaskId, uniqTaskId, withResources, withTime } from '../Queue/TaskProvider';
+import { Args } from '../Queue/Args';
+import { Resources } from '../Core/Resources';
+import { ContractAttributes, ContractType } from '../Core/Contract';
+import { UpgradeBuildingTask } from '../Task/UpgradeBuildingTask';
+import { ForgeImprovementTask } from '../Task/ForgeImprovementTask';
+import { isProductionTask } from '../Task/TaskMap';
+import { timestamp } from '../Helpers/Time';
 
 export class VillageTaskCollection {
     private readonly storage: VillageStorage;