diff --git a/bin/dvc-data-import b/bin/dvc-data-import
index 7d9cd8773..f1fff6a8c 100755
--- a/bin/dvc-data-import
+++ b/bin/dvc-data-import
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-PYTHONPATH=$DVC_HOME python $DVC_HOME/dvc/cmd_data_import.py $@
+PYTHONPATH=$DVC_HOME python $DVC_HOME/dvc/command/data_import.py $@
diff --git a/bin/dvc-data-remove b/bin/dvc-data-remove
index 56fe9273e..2536f9b4b 100755
--- a/bin/dvc-data-remove
+++ b/bin/dvc-data-remove
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-PYTHONPATH=$DVC_HOME python $DVC_HOME/dvc/cmd_data_remove.py $@
+PYTHONPATH=$DVC_HOME python $DVC_HOME/dvc/command/data_remove.py $@
diff --git a/bin/dvc-data-sync b/bin/dvc-data-sync
index 1cc1a57c7..3d5c06fff 100755
--- a/bin/dvc-data-sync
+++ b/bin/dvc-data-sync
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-PYTHONPATH=$DVC_HOME python $DVC_HOME/dvc/cmd_data_sync.py $@
+PYTHONPATH=$DVC_HOME python $DVC_HOME/dvc/command/data_sync.py $@
diff --git a/bin/dvc-init b/bin/dvc-init
index c45a2f54d..9ab17d6c0 100755
--- a/bin/dvc-init
+++ b/bin/dvc-init
@@ -1,4 +1,3 @@
 #!/bin/bash
 
-PYTHONPATH=$DVC_HOME python $DVC_HOME/dvc/cmd_init.py $@
-
+PYTHONPATH=$DVC_HOME python $DVC_HOME/dvc/command/init.py $@
diff --git a/bin/dvc-repro b/bin/dvc-repro
index 3c18b5d25..08924e9c1 100755
--- a/bin/dvc-repro
+++ b/bin/dvc-repro
@@ -1,4 +1,3 @@
 #!/bin/bash
 
-PYTHONPATH=$DVC_HOME python $DVC_HOME/dvc/cmd_repro.py $@
-
+PYTHONPATH=$DVC_HOME python $DVC_HOME/dvc/command/repro.py $@
diff --git a/bin/dvc-run b/bin/dvc-run
index 6001a5fb2..9c374c62d 100755
--- a/bin/dvc-run
+++ b/bin/dvc-run
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-PYTHONPATH=$DVC_HOME python $DVC_HOME/dvc/cmd_run.py $@
+PYTHONPATH=$DVC_HOME python $DVC_HOME/dvc/command/run.py $@
diff --git a/dvc/repository_change.py b/dvc/repository_change.py
index 23a03d252..393d3e15c 100644
--- a/dvc/repository_change.py
+++ b/dvc/repository_change.py
@@ -2,6 +2,7 @@ import os
 
 from dvc.exceptions import DvcException
 from dvc.git_wrapper import GitWrapper
+from dvc.executor import Executor
 
 
 class RepositoryChangeError(DvcException):
@@ -48,7 +49,7 @@ class RepositoryChange(object):
         self.config = config
         self.path_factory = path_factory
 
-        GitWrapper.exec_cmd_only_success(args, stdout, stderr)
+        Executor.exec_cmd_only_success(args, stdout, stderr)
         self._file_states = self._get_file_states()
 
         self._changed_data_items, self._externally_created_files = path_factory.to_data_items(self.changed_files)
diff --git a/functest/common.rc b/functest/common.rc
index f1cea5d8b..71c588a5c 100644
--- a/functest/common.rc
+++ b/functest/common.rc
@@ -8,18 +8,28 @@ TEST_REPO=repo_clean
 
 TEST_REPO=repo_clean
 
+function dvc_info() {
+    echo '=============== DVC test: $1 ==============='
+}
+
 function _init_repo() {
+    dvc_info 'init reporitory'
     git init
     dvc-init
+
+    dvc_info 'import xml files'
     mkdir data/xml
-    dvc-data-import ../$RAW_DATA_LOCAL/* data/xml
+    dvc-data-import "../$RAW_DATA_LOCAL/*" data/xml
+    
+    dvc_info 'copy code'
     mkdir code
-    cp ../$CODE_LOCAL/* code/
+    cp "../$CODE_LOCAL/*" code/
     git add code/
     git commit -m 'Add code'
 }
 
 function create_repo() {
+    dvc_info('create reporitory')
     rm -rf $TEST_REPO
     mkdir $TEST_REPO
     (cd $TEST_REPO && _init_repo)
diff --git a/functest/test-repro-code.sh b/functest/test-repro-code.sh
index 657c276dd..551c49035 100755
--- a/functest/test-repro-code.sh
+++ b/functest/test-repro-code.sh
@@ -4,12 +4,16 @@ source common.rc
 
 function run_test() {
     mkdir data/tsv
+
+    dvc_info 'convert Budget.xml to tsv'
     dvc-run --code code/xmltotsv.py python code/xmltotsv.py --extract row/@Id,row/@UserId,row/@Name,row/@Class,row/@TagBased,row/@Date data/xml/Badges.xml data/tsv/Badges.tsv
     
+    dvc_info 'modify code'
     echo " " >> code/xmltotsv.py 
     git commit -am 'Change code'
-    dvc-repro data/tsv/Badges.tsv
     
+    dvc_info 'reproduce tsv convertion code'
+    dvc-repro data/tsv/Badges.tsv
 }
 
 TEST_REPO=repo_repro_test