[fix_deploy] Fixed deployment by moving directory paths
Merge branch 'fix_deploy2' into fix_deploy