diff --git a/assembly/assembly-wsmaster-war/src/main/resources/META-INF/persistence.xml b/assembly/assembly-wsmaster-war/src/main/resources/META-INF/persistence.xml
index 9f2e8f33ef..acc59d8be1 100644
--- a/assembly/assembly-wsmaster-war/src/main/resources/META-INF/persistence.xml
+++ b/assembly/assembly-wsmaster-war/src/main/resources/META-INF/persistence.xml
@@ -34,7 +34,7 @@
         <class>org.eclipse.che.api.workspace.server.model.impl.stack.StackImpl</class>
 
         <class>org.eclipse.che.api.workspace.server.model.impl.CommandImpl</class>
-        <class>org.eclipse.che.api.workspace.server.model.impl.MachineSourceImpl</class>
+        <class>org.eclipse.che.workspace.infrastructure.docker.snapshot.MachineSourceImpl</class>
         <class>org.eclipse.che.workspace.infrastructure.docker.snapshot.SnapshotImpl</class>
         <class>org.eclipse.che.api.recipe.OldRecipeImpl</class>
 
diff --git a/infrastructures/docker/src/main/java/org/eclipse/che/workspace/infrastructure/docker/DockerInternalRuntime.java b/infrastructures/docker/src/main/java/org/eclipse/che/workspace/infrastructure/docker/DockerInternalRuntime.java
index 1a8759e17a..6d90ae4024 100644
--- a/infrastructures/docker/src/main/java/org/eclipse/che/workspace/infrastructure/docker/DockerInternalRuntime.java
+++ b/infrastructures/docker/src/main/java/org/eclipse/che/workspace/infrastructure/docker/DockerInternalRuntime.java
@@ -13,7 +13,7 @@ package org.eclipse.che.workspace.infrastructure.docker;
 import com.google.inject.assistedinject.Assisted;
 
 import org.eclipse.che.api.core.NotFoundException;
-import org.eclipse.che.api.core.model.machine.MachineSource;
+import org.eclipse.che.workspace.infrastructure.docker.snapshot.MachineSource;
 import org.eclipse.che.api.core.model.workspace.runtime.Machine;
 import org.eclipse.che.api.core.model.workspace.runtime.MachineStatus;
 import org.eclipse.che.api.core.model.workspace.runtime.RuntimeIdentity;
@@ -22,7 +22,7 @@ import org.eclipse.che.api.core.notification.EventService;
 import org.eclipse.che.api.workspace.server.DtoConverter;
 import org.eclipse.che.api.workspace.server.URLRewriter;
 import org.eclipse.che.api.workspace.server.model.impl.MachineImpl;
-import org.eclipse.che.api.workspace.server.model.impl.MachineSourceImpl;
+import org.eclipse.che.workspace.infrastructure.docker.snapshot.MachineSourceImpl;
 import org.eclipse.che.api.workspace.server.spi.InfrastructureException;
 import org.eclipse.che.api.workspace.server.spi.InternalInfrastructureException;
 import org.eclipse.che.api.workspace.server.spi.InternalMachineConfig;
diff --git a/infrastructures/docker/src/main/java/org/eclipse/che/workspace/infrastructure/docker/DockerMachineSource.java b/infrastructures/docker/src/main/java/org/eclipse/che/workspace/infrastructure/docker/DockerMachineSource.java
index 763fe22533..305fde4471 100644
--- a/infrastructures/docker/src/main/java/org/eclipse/che/workspace/infrastructure/docker/DockerMachineSource.java
+++ b/infrastructures/docker/src/main/java/org/eclipse/che/workspace/infrastructure/docker/DockerMachineSource.java
@@ -10,8 +10,8 @@
  *******************************************************************************/
 package org.eclipse.che.workspace.infrastructure.docker;
 
-import org.eclipse.che.api.core.model.machine.MachineSource;
-import org.eclipse.che.api.workspace.server.model.impl.MachineSourceImpl;
+import org.eclipse.che.workspace.infrastructure.docker.snapshot.MachineSource;
+import org.eclipse.che.workspace.infrastructure.docker.snapshot.MachineSourceImpl;
 import org.eclipse.che.api.workspace.server.spi.InternalInfrastructureException;
 import org.eclipse.che.plugin.docker.client.DockerFileException;
 import org.eclipse.che.plugin.docker.client.DockerRegistryAuthResolver;
diff --git a/infrastructures/docker/src/main/java/org/eclipse/che/workspace/infrastructure/docker/DockerMachineStarter.java b/infrastructures/docker/src/main/java/org/eclipse/che/workspace/infrastructure/docker/DockerMachineStarter.java
index b20da63bf8..4d9e9e6508 100644
--- a/infrastructures/docker/src/main/java/org/eclipse/che/workspace/infrastructure/docker/DockerMachineStarter.java
+++ b/infrastructures/docker/src/main/java/org/eclipse/che/workspace/infrastructure/docker/DockerMachineStarter.java
@@ -20,7 +20,7 @@ import org.eclipse.che.api.core.model.workspace.config.ServerConfig;
 import org.eclipse.che.api.core.model.workspace.runtime.RuntimeIdentity;
 import org.eclipse.che.api.core.util.FileCleaner;
 import org.eclipse.che.api.core.util.SystemInfo;
-import org.eclipse.che.api.workspace.server.model.impl.MachineSourceImpl;
+import org.eclipse.che.workspace.infrastructure.docker.snapshot.MachineSourceImpl;
 import org.eclipse.che.api.workspace.server.spi.InfrastructureException;
 import org.eclipse.che.api.workspace.server.spi.InternalInfrastructureException;
 import org.eclipse.che.commons.annotation.Nullable;
@@ -55,7 +55,6 @@ import org.eclipse.che.plugin.docker.client.params.StartContainerParams;
 import org.eclipse.che.plugin.docker.client.params.TagParams;
 import org.eclipse.che.plugin.docker.client.params.network.ConnectContainerToNetworkParams;
 import org.eclipse.che.workspace.infrastructure.docker.exception.SourceNotFoundException;
-import org.eclipse.che.plugin.docker.client.params.network.RemoveNetworkParams;
 import org.eclipse.che.workspace.infrastructure.docker.model.DockerContainerConfig;
 import org.eclipse.che.workspace.infrastructure.docker.monit.AbnormalMachineStopHandler;
 import org.eclipse.che.workspace.infrastructure.docker.monit.DockerMachineStopDetector;
diff --git a/infrastructures/docker/src/main/java/org/eclipse/che/workspace/infrastructure/docker/DockerRegistryClient.java b/infrastructures/docker/src/main/java/org/eclipse/che/workspace/infrastructure/docker/DockerRegistryClient.java
index 197d5ece7a..8b5b2987e7 100644
--- a/infrastructures/docker/src/main/java/org/eclipse/che/workspace/infrastructure/docker/DockerRegistryClient.java
+++ b/infrastructures/docker/src/main/java/org/eclipse/che/workspace/infrastructure/docker/DockerRegistryClient.java
@@ -12,7 +12,7 @@ package org.eclipse.che.workspace.infrastructure.docker;
 
 import com.google.inject.Inject;
 
-import org.eclipse.che.api.core.model.machine.MachineSource;
+import org.eclipse.che.workspace.infrastructure.docker.snapshot.MachineSource;
 import org.eclipse.che.commons.lang.IoUtil;
 import org.eclipse.che.plugin.docker.client.DockerConnector;
 import org.eclipse.che.plugin.docker.client.DockerConnectorProvider;
diff --git a/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/machine/MachineSource.java b/infrastructures/docker/src/main/java/org/eclipse/che/workspace/infrastructure/docker/snapshot/MachineSource.java
similarity index 93%
rename from core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/machine/MachineSource.java
rename to infrastructures/docker/src/main/java/org/eclipse/che/workspace/infrastructure/docker/snapshot/MachineSource.java
index 22fee19335..1de1c5d304 100644
--- a/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/machine/MachineSource.java
+++ b/infrastructures/docker/src/main/java/org/eclipse/che/workspace/infrastructure/docker/snapshot/MachineSource.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.api.core.model.machine;
+package org.eclipse.che.workspace.infrastructure.docker.snapshot;
 
 /**
  * @author gazarenkov
diff --git a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/model/impl/MachineSourceImpl.java b/infrastructures/docker/src/main/java/org/eclipse/che/workspace/infrastructure/docker/snapshot/MachineSourceImpl.java
similarity index 96%
rename from wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/model/impl/MachineSourceImpl.java
rename to infrastructures/docker/src/main/java/org/eclipse/che/workspace/infrastructure/docker/snapshot/MachineSourceImpl.java
index b29382c777..010fa5f406 100644
--- a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/model/impl/MachineSourceImpl.java
+++ b/infrastructures/docker/src/main/java/org/eclipse/che/workspace/infrastructure/docker/snapshot/MachineSourceImpl.java
@@ -8,9 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.api.workspace.server.model.impl;
-
-import org.eclipse.che.api.core.model.machine.MachineSource;
+package org.eclipse.che.workspace.infrastructure.docker.snapshot;
 
 import javax.persistence.Column;
 import javax.persistence.Embeddable;
diff --git a/infrastructures/docker/src/main/java/org/eclipse/che/workspace/infrastructure/docker/snapshot/SnapshotImpl.java b/infrastructures/docker/src/main/java/org/eclipse/che/workspace/infrastructure/docker/snapshot/SnapshotImpl.java
index 7b46b58f24..c73610b879 100644
--- a/infrastructures/docker/src/main/java/org/eclipse/che/workspace/infrastructure/docker/snapshot/SnapshotImpl.java
+++ b/infrastructures/docker/src/main/java/org/eclipse/che/workspace/infrastructure/docker/snapshot/SnapshotImpl.java
@@ -10,8 +10,6 @@
  *******************************************************************************/
 package org.eclipse.che.workspace.infrastructure.docker.snapshot;
 
-import org.eclipse.che.api.core.model.machine.MachineSource;
-import org.eclipse.che.api.workspace.server.model.impl.MachineSourceImpl;
 import org.eclipse.che.commons.lang.NameGenerator;
 
 import javax.persistence.Column;
diff --git a/infrastructures/docker/src/test/java/org/eclipse/che/workspace/infrastructure/docker/old/DockerMachineSourceTest.java b/infrastructures/docker/src/test/java/org/eclipse/che/workspace/infrastructure/docker/old/DockerMachineSourceTest.java
index 3fa7ab1be4..c056a819a9 100644
--- a/infrastructures/docker/src/test/java/org/eclipse/che/workspace/infrastructure/docker/old/DockerMachineSourceTest.java
+++ b/infrastructures/docker/src/test/java/org/eclipse/che/workspace/infrastructure/docker/old/DockerMachineSourceTest.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.che.workspace.infrastructure.docker.old;
 
-import org.eclipse.che.api.core.model.machine.MachineSource;
+import org.eclipse.che.workspace.infrastructure.docker.snapshot.MachineSource;
 import org.eclipse.che.api.workspace.server.spi.InternalInfrastructureException;
 import org.eclipse.che.workspace.infrastructure.docker.DockerMachineSource;
 import org.mockito.Mock;
diff --git a/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/RecipeRetrieverTest.java b/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/RecipeRetrieverTest.java
index 7dacf53eb2..ae20d89957 100644
--- a/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/RecipeRetrieverTest.java
+++ b/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/RecipeRetrieverTest.java
@@ -10,7 +10,6 @@
  *******************************************************************************/
 package org.eclipse.che.api.workspace.server;
 
-import org.eclipse.che.api.core.model.machine.MachineSource;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.testng.MockitoTestNGListener;
@@ -40,12 +39,6 @@ public class RecipeRetrieverTest {
 //    @Mock
 //    private OldMachineConfig machineConfig;
 
-    /**
-     * OldMachine source embedded in machine config.
-     */
-    @Mock
-    private MachineSource machineSource;
-
     /**
      * Instance used in tests.
      */