diff --git a/prepare-docs.sh b/prepare-docs.sh
index d564c2e1f..7f42eb035 100755
--- a/prepare-docs.sh
+++ b/prepare-docs.sh
@@ -80,6 +80,8 @@ sed -i.bak -e 's/\*\*--\[no-\]import-eq-suggestions\*\*/`--[no-]import-eq-sugges
 sed -i.bak -e 's/\*\*--\[no-\]translate-hidden\*\*/`--[no-]translate-hidden`/g' -- *.md
 sed -i.bak -e 's/\*\*--\[no-\]preserve-hierarchy\*\*/`--[no-]preserve-hierarchy`/g' -- *.md
 sed -i.bak -e 's/\*\*--\[no-\]auto-tag\*\*/`--[no-]auto-tag`/g' -- *.md
+sed -i.bak -e 's/\*\*--\[no-\]cleanup-mode\*\*/`--[no-]cleanup-mode`/g' -- *.md
+sed -i.bak -e 's/\*\*--\[no-\]update-strings\*\*/`--[no-]update-strings`/g' -- *.md
 
 rm -- *.md.bak
 
diff --git a/src/main/java/com/crowdin/cli/client/CrowdinClientLabel.java b/src/main/java/com/crowdin/cli/client/CrowdinClientLabel.java
index 230324c4e..19aed5acb 100644
--- a/src/main/java/com/crowdin/cli/client/CrowdinClientLabel.java
+++ b/src/main/java/com/crowdin/cli/client/CrowdinClientLabel.java
@@ -1,38 +1,38 @@
-package com.crowdin.cli.client;
-
-import com.crowdin.client.Client;
-import com.crowdin.client.labels.model.AddLabelRequest;
-import com.crowdin.client.labels.model.Label;
-import lombok.AllArgsConstructor;
-
-import java.util.List;
-
-import static java.lang.Long.parseLong;
-
-@AllArgsConstructor
-public class CrowdinClientLabel extends CrowdinClientCore implements ClientLabel {
-
-    private final Client client;
-    private final String projectId;
-
-    @Override
-    public List<Label> listLabels() {
-        return executeRequestFullList((limit, offset) -> this.client.getLabelsApi()
-            .listLabels(parseLong(this.projectId), limit, offset));
-    }
-
-    @Override
-    public Label addLabel(AddLabelRequest request) {
-        return executeRequest(() -> this.client.getLabelsApi()
-            .addLabel(parseLong(this.projectId), request)
-            .getData());
-    }
-
-    @Override
-    public void deleteLabel(Long id) {
-        executeRequest(() -> {
-            this.client.getLabelsApi().deleteLabel(parseLong(this.projectId), id);
-            return null;
-        });
-    }
-}
+package com.crowdin.cli.client;
+
+import com.crowdin.client.Client;
+import com.crowdin.client.labels.model.AddLabelRequest;
+import com.crowdin.client.labels.model.Label;
+import lombok.AllArgsConstructor;
+
+import java.util.List;
+
+import static java.lang.Long.parseLong;
+
+@AllArgsConstructor
+public class CrowdinClientLabel extends CrowdinClientCore implements ClientLabel {
+
+    private final Client client;
+    private final String projectId;
+
+    @Override
+    public List<Label> listLabels() {
+        return executeRequestFullList((limit, offset) -> this.client.getLabelsApi()
+            .listLabels(parseLong(this.projectId), limit, offset, null));
+    }
+
+    @Override
+    public Label addLabel(AddLabelRequest request) {
+        return executeRequest(() -> this.client.getLabelsApi()
+            .addLabel(parseLong(this.projectId), request)
+            .getData());
+    }
+
+    @Override
+    public void deleteLabel(Long id) {
+        executeRequest(() -> {
+            this.client.getLabelsApi().deleteLabel(parseLong(this.projectId), id);
+            return null;
+        });
+    }
+}
diff --git a/src/main/java/com/crowdin/cli/client/CrowdinClientTask.java b/src/main/java/com/crowdin/cli/client/CrowdinClientTask.java
index 0c819394a..f12f5f60a 100644
--- a/src/main/java/com/crowdin/cli/client/CrowdinClientTask.java
+++ b/src/main/java/com/crowdin/cli/client/CrowdinClientTask.java
@@ -19,7 +19,7 @@ public CrowdinClientTask(com.crowdin.client.Client client, String projectId) {
     @Override
     public List<Task> listTask(Status status) {
         return executeRequestFullList((limit, offset) -> this.client.getTasksApi()
-            .listTasks(Long.valueOf(projectId), limit, offset, status));
+            .listTasks(Long.valueOf(projectId), limit, offset, status, null));
     }
 
     @Override
diff --git a/src/main/java/com/crowdin/cli/client/CrowdinClientTm.java b/src/main/java/com/crowdin/cli/client/CrowdinClientTm.java
index dc1ced51f..ca81b2f4c 100644
--- a/src/main/java/com/crowdin/cli/client/CrowdinClientTm.java
+++ b/src/main/java/com/crowdin/cli/client/CrowdinClientTm.java
@@ -24,7 +24,7 @@ public CrowdinClientTm(com.crowdin.client.Client client) {
     @Override
     public List<TranslationMemory> listTms() {
         return executeRequestFullList((limit, offset) -> this.client.getTranslationMemoryApi()
-            .listTms(null, limit, offset));
+            .listTms(null, limit, offset, null));
     }
 
     @Override
diff --git a/src/main/java/com/crowdin/cli/client/CrowdinProjectClient.java b/src/main/java/com/crowdin/cli/client/CrowdinProjectClient.java
index 79df781bb..ccd96b7bf 100644
--- a/src/main/java/com/crowdin/cli/client/CrowdinProjectClient.java
+++ b/src/main/java/com/crowdin/cli/client/CrowdinProjectClient.java
@@ -4,34 +4,22 @@
 import com.crowdin.client.labels.model.AddLabelRequest;
 import com.crowdin.client.labels.model.Label;
 import com.crowdin.client.projectsgroups.model.ProjectSettings;
-import com.crowdin.client.sourcefiles.model.AddBranchRequest;
-import com.crowdin.client.sourcefiles.model.AddDirectoryRequest;
-import com.crowdin.client.sourcefiles.model.AddFileRequest;
-import com.crowdin.client.sourcefiles.model.Branch;
-import com.crowdin.client.sourcefiles.model.BuildReviewedSourceFilesRequest;
-import com.crowdin.client.sourcefiles.model.Directory;
-import com.crowdin.client.sourcefiles.model.ReviewedStringsBuild;
-import com.crowdin.client.sourcefiles.model.UpdateFileRequest;
+import com.crowdin.client.projectsgroups.model.Type;
+import com.crowdin.client.sourcefiles.model.*;
 import com.crowdin.client.sourcestrings.model.AddSourceStringRequest;
 import com.crowdin.client.sourcestrings.model.SourceString;
+import com.crowdin.client.sourcestrings.model.UploadStringsProgress;
+import com.crowdin.client.sourcestrings.model.UploadStringsRequest;
 import com.crowdin.client.storage.model.Storage;
 import com.crowdin.client.stringcomments.model.AddStringCommentRequest;
 import com.crowdin.client.stringcomments.model.StringComment;
-import com.crowdin.client.translations.model.ApplyPreTranslationRequest;
-import com.crowdin.client.translations.model.BuildProjectTranslationRequest;
-import com.crowdin.client.translations.model.ExportProjectTranslationRequest;
-import com.crowdin.client.translations.model.PreTranslationStatus;
-import com.crowdin.client.translations.model.ProjectBuild;
-import com.crowdin.client.translations.model.UploadTranslationsRequest;
+import com.crowdin.client.translations.model.*;
 import com.crowdin.client.translationstatus.model.LanguageProgress;
 import org.apache.commons.lang3.StringUtils;
 
 import java.io.InputStream;
 import java.net.URL;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
 import java.util.function.BiPredicate;
 
 import static com.crowdin.cli.BaseCli.RESOURCE_BUNDLE;
@@ -78,6 +66,10 @@ private void populateProjectWithStructure(CrowdinProjectFull project, String bra
                 )
                 .ifPresent(project::setBranch);
         Long branchId = Optional.ofNullable(project.getBranch()).map(Branch::getId).orElse(null);
+
+        if (Objects.equals(project.getType(), Type.STRINGS_BASED)) {
+            return;
+        }
         project.setFiles(executeRequestFullList((limit, offset) -> this.client.getSourceFilesApi()
             .listFiles(this.projectId, branchId, null, null, true, limit, offset)));
         project.setDirectories(executeRequestFullList((limit, offset) -> this.client.getSourceFilesApi()
@@ -92,6 +84,7 @@ private void populateProjectWithLangs(CrowdinProject project) {
     private void populateProjectWithInfo(CrowdinProjectInfo project) {
         com.crowdin.client.projectsgroups.model.Project projectModel = this.getProject();
         project.setProjectId(projectModel.getId());
+        project.setType(projectModel.getType());
         project.setSourceLanguageId(projectModel.getSourceLanguageId());
         project.setProjectLanguages(projectModel.getTargetLanguages());
         if (projectModel instanceof ProjectSettings) {
@@ -223,6 +216,20 @@ public void addSource(AddFileRequest request) throws ResponseException {
                 .addFile(this.projectId, request));
     }
 
+    @Override
+    public UploadStringsProgress addSourceStringsBased(UploadStringsRequest request) {
+        return executeRequest(
+            () -> this.client.getSourceStringsApi().uploadStrings(this.projectId, request).getData()
+        );
+    }
+
+    @Override
+    public UploadStringsProgress getUploadStringsStatus(String uploadId) {
+        return executeRequest(
+            () -> this.client.getSourceStringsApi().uploadStringsStatus(this.projectId, uploadId).getData()
+        );
+    }
+
     @Override
     public void editSource(Long fileId, List<PatchRequest> request) {
         executeRequest(() -> this.client.getSourceFilesApi()
@@ -252,6 +259,12 @@ public void uploadTranslations(String languageId, UploadTranslationsRequest requ
                 .uploadTranslations(this.projectId, languageId, request));
     }
 
+    @Override
+    public void uploadTranslationStringsBased(String languageId, UploadTranslationsStringsRequest request) {
+        executeRequest(() -> this.client.getTranslationsApi()
+            .uploadTranslationStringsBased(this.projectId, languageId, request));
+    }
+
     @Override
     public ProjectBuild startBuildingTranslation(BuildProjectTranslationRequest request) throws ResponseException {
         Map<BiPredicate<String, String>, ResponseException> errorHandler = new LinkedHashMap<BiPredicate<String, String>, ResponseException>() {{
@@ -273,6 +286,13 @@ public ProjectBuild checkBuildingTranslation(Long buildId) {
             .getData());
     }
 
+    @Override
+    public URL buildProjectFileTranslation(Long fileId, BuildProjectFileTranslationRequest request) {
+        return url(executeRequest(() -> this.client.getTranslationsApi()
+            .buildProjectFileTranslation(projectId, fileId, null, request)
+            .getData()));
+    }
+
     @Override
     public URL downloadBuild(Long buildId) {
         return url(executeRequest(() -> this.client.getTranslationsApi()
@@ -347,7 +367,7 @@ public URL exportProjectTranslation(ExportProjectTranslationRequest request) {
     @Override
     public List<Label> listLabels() {
         return executeRequestFullList((limit, offset) -> this.client.getLabelsApi()
-            .listLabels(this.projectId, limit, offset));
+            .listLabels(this.projectId, limit, offset, null));
     }
 
     @Override
diff --git a/src/main/java/com/crowdin/cli/client/CrowdinProjectInfo.java b/src/main/java/com/crowdin/cli/client/CrowdinProjectInfo.java
index d0b852704..2ee0b91bd 100644
--- a/src/main/java/com/crowdin/cli/client/CrowdinProjectInfo.java
+++ b/src/main/java/com/crowdin/cli/client/CrowdinProjectInfo.java
@@ -1,6 +1,7 @@
 package com.crowdin.cli.client;
 
 import com.crowdin.client.languages.model.Language;
+import com.crowdin.client.projectsgroups.model.Type;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -11,6 +12,7 @@ public class CrowdinProjectInfo {
     private Long projectId;
     private String sourceLanguageId;
     private Access accessLevel;
+    private Type type;
     private Language inContextLanguage;
     private LanguageMapping languageMapping;
     private List<Language> projectLanguages;
@@ -44,6 +46,14 @@ public boolean isManagerAccess() {
         return accessLevel == Access.MANAGER;
     }
 
+    public void setType(Type type) {
+        this.type = type;
+    }
+
+    public Type getType() {
+        return type;
+    }
+
     void setInContextLanguage(Language inContextLanguage) {
         this.inContextLanguage = inContextLanguage;
     }
@@ -90,5 +100,4 @@ public List<Language> getProjectLanguages(boolean withInContextLang) {
     public enum Access {
         TRANSLATOR, MANAGER
     }
-
 }
diff --git a/src/main/java/com/crowdin/cli/client/ProjectClient.java b/src/main/java/com/crowdin/cli/client/ProjectClient.java
index 8e7f11e2d..1b8d852d5 100644
--- a/src/main/java/com/crowdin/cli/client/ProjectClient.java
+++ b/src/main/java/com/crowdin/cli/client/ProjectClient.java
@@ -1,26 +1,18 @@
 package com.crowdin.cli.client;
 
+import com.crowdin.client.core.model.DownloadLink;
 import com.crowdin.client.core.model.PatchRequest;
+import com.crowdin.client.distributions.model.DistributionRelease;
 import com.crowdin.client.labels.model.AddLabelRequest;
 import com.crowdin.client.labels.model.Label;
-import com.crowdin.client.sourcefiles.model.AddBranchRequest;
-import com.crowdin.client.sourcefiles.model.AddDirectoryRequest;
-import com.crowdin.client.sourcefiles.model.AddFileRequest;
-import com.crowdin.client.sourcefiles.model.Branch;
-import com.crowdin.client.sourcefiles.model.BuildReviewedSourceFilesRequest;
-import com.crowdin.client.sourcefiles.model.Directory;
-import com.crowdin.client.sourcefiles.model.ReviewedStringsBuild;
-import com.crowdin.client.sourcefiles.model.UpdateFileRequest;
+import com.crowdin.client.sourcefiles.model.*;
 import com.crowdin.client.sourcestrings.model.AddSourceStringRequest;
 import com.crowdin.client.sourcestrings.model.SourceString;
+import com.crowdin.client.sourcestrings.model.UploadStringsProgress;
+import com.crowdin.client.sourcestrings.model.UploadStringsRequest;
 import com.crowdin.client.stringcomments.model.AddStringCommentRequest;
 import com.crowdin.client.stringcomments.model.StringComment;
-import com.crowdin.client.translations.model.ApplyPreTranslationRequest;
-import com.crowdin.client.translations.model.BuildProjectTranslationRequest;
-import com.crowdin.client.translations.model.ExportProjectTranslationRequest;
-import com.crowdin.client.translations.model.PreTranslationStatus;
-import com.crowdin.client.translations.model.ProjectBuild;
-import com.crowdin.client.translations.model.UploadTranslationsRequest;
+import com.crowdin.client.translations.model.*;
 import com.crowdin.client.translationstatus.model.LanguageProgress;
 
 import java.io.InputStream;
@@ -55,16 +47,24 @@ default CrowdinProjectFull downloadFullProject() {
 
     void addSource(AddFileRequest request) throws ResponseException;
 
+    UploadStringsProgress addSourceStringsBased(UploadStringsRequest request);
+
+    UploadStringsProgress getUploadStringsStatus(String uploadId);
+
     void editSource(Long fileId, List<PatchRequest> request);
 
     void deleteSource(Long fileId);
 
     void uploadTranslations(String languageId, UploadTranslationsRequest request) throws ResponseException;
 
+    void uploadTranslationStringsBased(String languageId, UploadTranslationsStringsRequest request);
+
     ProjectBuild startBuildingTranslation(BuildProjectTranslationRequest request) throws ResponseException;
 
     ProjectBuild checkBuildingTranslation(Long buildId);
 
+    URL buildProjectFileTranslation(Long fileId, BuildProjectFileTranslationRequest request);
+
     URL downloadBuild(Long buildId);
 
     ReviewedStringsBuild startBuildingReviewedSources(BuildReviewedSourceFilesRequest request);
diff --git a/src/main/java/com/crowdin/cli/commands/Actions.java b/src/main/java/com/crowdin/cli/commands/Actions.java
index 09640cbd4..6a9702c96 100644
--- a/src/main/java/com/crowdin/cli/commands/Actions.java
+++ b/src/main/java/com/crowdin/cli/commands/Actions.java
@@ -132,4 +132,14 @@ NewAction<PropertiesWithFiles, ProjectClient> preTranslate(
     NewAction<ProjectProperties, ClientLabel> labelAdd(String title, boolean plainView);
 
     NewAction<ProjectProperties, ClientLabel> labelDelete(String title);
+
+    NewAction<ProjectProperties, ProjectClient> fileUpload(File file, String branch, boolean autoUpdate, List<String> labels, String destination, List<String> excludedLanguages,  boolean plainView, boolean cleanupMode, boolean updateString);
+
+    NewAction<ProjectProperties, ProjectClient> fileUploadTranslation(File file, String branch, String dest, String languageId, boolean plainView);
+
+    NewAction<ProjectProperties, ProjectClient> fileDownload(String file, String branch, String destParam);
+
+    NewAction<ProjectProperties, ProjectClient> fileDownloadTranslation(String file, String languageId, String branch, String destParam);
+
+    NewAction<ProjectProperties, ProjectClient> fileDelete(String file, String branch);
 }
diff --git a/src/main/java/com/crowdin/cli/commands/actions/CliActions.java b/src/main/java/com/crowdin/cli/commands/actions/CliActions.java
index 20f1ee80b..2d9a71fab 100644
--- a/src/main/java/com/crowdin/cli/commands/actions/CliActions.java
+++ b/src/main/java/com/crowdin/cli/commands/actions/CliActions.java
@@ -276,4 +276,29 @@ public NewAction<ProjectProperties, ClientLabel> labelAdd(String title, boolean
     public NewAction<ProjectProperties, ClientLabel> labelDelete(String title) {
         return new LabelDeleteAction(title);
     }
+
+    @Override
+    public NewAction<ProjectProperties, ProjectClient> fileUpload(File file, String branch, boolean autoUpdate, List<String> labels, String destination, List<String> excludedLanguages, boolean plainView, boolean cleanupMode, boolean updateStrings) {
+        return new FileUploadAction(file, branch, autoUpdate, labels, destination, cleanupMode, updateStrings, excludedLanguages, plainView);
+    }
+
+    @Override
+    public NewAction<ProjectProperties, ProjectClient> fileUploadTranslation(File file, String branch, String dest, String languageId, boolean plainView) {
+        return new FileUploadTranslationAction(file, branch, dest, languageId, plainView);
+    }
+
+    @Override
+    public NewAction<ProjectProperties, ProjectClient> fileDownload(String file, String branch, String destParam) {
+        return new FileDownloadAction(file, branch, destParam);
+    }
+
+    @Override
+    public NewAction<ProjectProperties, ProjectClient> fileDownloadTranslation(String file, String languageId, String branch, String destParam) {
+        return new FileDownloadTranslationAction(file, languageId, branch, destParam);
+    }
+
+    @Override
+    public NewAction<ProjectProperties, ProjectClient> fileDelete(String file, String branch) {
+        return new FileDeleteAction(file, branch);
+    }
 }
diff --git a/src/main/java/com/crowdin/cli/commands/actions/DownloadAction.java b/src/main/java/com/crowdin/cli/commands/actions/DownloadAction.java
index bc47f8b1c..48e9b556f 100644
--- a/src/main/java/com/crowdin/cli/commands/actions/DownloadAction.java
+++ b/src/main/java/com/crowdin/cli/commands/actions/DownloadAction.java
@@ -416,7 +416,7 @@ private ProjectBuild buildTranslation(ProjectClient client, BuildProjectTranslat
 
         return ConsoleSpinner.execute(
             out,
-            "message.spinner.building_translation",
+            "message.spinner.building_translations",
             "error.building_translation",
             this.noProgress,
             this.plainView,
@@ -537,7 +537,7 @@ private Map<String, String> doTranslationMapping(
     }
 
     private void downloadTranslations(ProjectClient client, Long buildId, String archivePath) {
-        ConsoleSpinner.execute(out, "message.spinner.downloading_translation", "error.downloading_file", this.noProgress, this.plainView, () -> {
+        ConsoleSpinner.execute(out, "message.spinner.downloading_translations", "error.downloading_file", this.noProgress, this.plainView, () -> {
             URL url = client.downloadBuild(buildId);
             try (InputStream data = url.openStream()) {
                 files.writeToFile(archivePath, data);
diff --git a/src/main/java/com/crowdin/cli/commands/actions/FileDeleteAction.java b/src/main/java/com/crowdin/cli/commands/actions/FileDeleteAction.java
new file mode 100644
index 000000000..83babd4de
--- /dev/null
+++ b/src/main/java/com/crowdin/cli/commands/actions/FileDeleteAction.java
@@ -0,0 +1,47 @@
+package com.crowdin.cli.commands.actions;
+
+import com.crowdin.cli.client.CrowdinProjectFull;
+import com.crowdin.cli.client.ProjectClient;
+import com.crowdin.cli.commands.NewAction;
+import com.crowdin.cli.commands.Outputter;
+import com.crowdin.cli.properties.ProjectProperties;
+import com.crowdin.cli.utils.Utils;
+import com.crowdin.cli.utils.console.ConsoleSpinner;
+import com.crowdin.cli.utils.console.ExecutionStatus;
+import com.crowdin.client.projectsgroups.model.Type;
+import com.crowdin.client.sourcefiles.model.FileInfo;
+import lombok.AllArgsConstructor;
+
+import java.util.List;
+import java.util.Objects;
+
+import static com.crowdin.cli.BaseCli.RESOURCE_BUNDLE;
+import static com.crowdin.cli.utils.console.ExecutionStatus.SKIPPED;
+import static java.util.Objects.nonNull;
+
+@AllArgsConstructor
+class FileDeleteAction implements NewAction<ProjectProperties, ProjectClient> {
+
+    private final String file;
+    private final String branch;
+
+    @Override
+    public void act(Outputter out, ProjectProperties properties, ProjectClient client) {
+        CrowdinProjectFull project = ConsoleSpinner
+            .execute(out, "message.spinner.fetching_project_info", "error.collect_project_info",
+                true, true, client::downloadFullProject);
+        if (Objects.equals(project.getType(), Type.STRINGS_BASED)) {
+            out.println(SKIPPED.withIcon(RESOURCE_BUNDLE.getString("message.no_file_string_project")));
+            return;
+        }
+        String branchPrefix = nonNull(branch) ? branch + Utils.PATH_SEPARATOR : "";
+        String filePath = Utils.toUnixPath(Utils.sepAtStart(branchPrefix + file));
+        List<FileInfo> projectFiles = project.getFileInfos();
+        FileInfo foundFile = projectFiles.stream()
+            .filter(f -> Objects.equals(filePath, f.getPath()))
+            .findFirst()
+            .orElseThrow(() -> new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.file_not_found"), filePath)));
+        client.deleteSource(foundFile.getId());
+        out.println(ExecutionStatus.OK.withIcon(String.format(RESOURCE_BUNDLE.getString("message.file_deleted"), filePath)));
+    }
+}
diff --git a/src/main/java/com/crowdin/cli/commands/actions/FileDownloadAction.java b/src/main/java/com/crowdin/cli/commands/actions/FileDownloadAction.java
new file mode 100644
index 000000000..86b2a6c18
--- /dev/null
+++ b/src/main/java/com/crowdin/cli/commands/actions/FileDownloadAction.java
@@ -0,0 +1,78 @@
+package com.crowdin.cli.commands.actions;
+
+import com.crowdin.cli.client.CrowdinProjectFull;
+import com.crowdin.cli.client.ProjectClient;
+import com.crowdin.cli.commands.NewAction;
+import com.crowdin.cli.commands.Outputter;
+import com.crowdin.cli.commands.functionality.FilesInterface;
+import com.crowdin.cli.commands.functionality.FsFiles;
+import com.crowdin.cli.properties.ProjectProperties;
+import com.crowdin.cli.utils.Utils;
+import com.crowdin.cli.utils.console.ConsoleSpinner;
+import com.crowdin.client.projectsgroups.model.Type;
+import com.crowdin.client.sourcefiles.model.FileInfo;
+import lombok.AllArgsConstructor;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Objects;
+
+import static com.crowdin.cli.BaseCli.RESOURCE_BUNDLE;
+import static com.crowdin.cli.utils.console.ExecutionStatus.OK;
+import static com.crowdin.cli.utils.console.ExecutionStatus.WARNING;
+import static java.util.Objects.nonNull;
+
+@AllArgsConstructor
+class FileDownloadAction implements NewAction<ProjectProperties, ProjectClient> {
+
+    private final String file;
+    private final String branch;
+    private final String dest;
+
+    @Override
+    public void act(Outputter out, ProjectProperties properties, ProjectClient client) {
+        CrowdinProjectFull project = ConsoleSpinner
+            .execute(out, "message.spinner.fetching_project_info", "error.collect_project_info",
+                false, false, () -> client.downloadFullProject(branch));
+        if (Objects.equals(project.getType(), Type.STRINGS_BASED)) {
+            out.println(WARNING.withIcon(RESOURCE_BUNDLE.getString("message.no_file_string_project")));
+            return;
+        }
+        if (!project.isManagerAccess()) {
+            out.println(WARNING.withIcon(RESOURCE_BUNDLE.getString("message.no_manager_access")));
+            return;
+        }
+
+        String branchPrefix = nonNull(branch) ? branch + Utils.PATH_SEPARATOR : "";
+        String filePath = Utils.toUnixPath(Utils.sepAtStart(branchPrefix + file));
+        FileInfo foundFile = project.getFileInfos().stream()
+            .filter(f -> Objects.equals(filePath, f.getPath()))
+            .findFirst()
+            .orElseThrow(() -> new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.file_not_found"), filePath)));
+        ConsoleSpinner.execute(
+            out,
+            "message.spinner.downloading_file",
+            "error.downloading_file",
+            false,
+            false,
+            () -> {
+                URL url = client.downloadFile(foundFile.getId());
+                String destPath = nonNull(dest) ? Utils.sepAtEnd(dest) + foundFile.getName() : file;
+                saveToFile(Utils.normalizePath(Utils.joinPaths(properties.getBasePath(), destPath)), url);
+                return url;
+            }
+        );
+        out.println(OK.withIcon(String.format(RESOURCE_BUNDLE.getString("message.downloaded_file"), filePath)));
+        out.println(WARNING.withIcon(RESOURCE_BUNDLE.getString("message.experimental_command")));
+    }
+
+    private void saveToFile(String destPath, URL url) {
+        FilesInterface files = new FsFiles();
+        try (InputStream data = url.openStream()) {
+            files.writeToFile(destPath, data);
+        } catch (IOException e) {
+            throw new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.write_file"), destPath), e);
+        }
+    }
+}
diff --git a/src/main/java/com/crowdin/cli/commands/actions/FileDownloadTranslationAction.java b/src/main/java/com/crowdin/cli/commands/actions/FileDownloadTranslationAction.java
new file mode 100644
index 000000000..dc2e3ff5a
--- /dev/null
+++ b/src/main/java/com/crowdin/cli/commands/actions/FileDownloadTranslationAction.java
@@ -0,0 +1,102 @@
+package com.crowdin.cli.commands.actions;
+
+import com.crowdin.cli.client.CrowdinProjectFull;
+import com.crowdin.cli.client.ProjectClient;
+import com.crowdin.cli.commands.NewAction;
+import com.crowdin.cli.commands.Outputter;
+import com.crowdin.cli.commands.functionality.FilesInterface;
+import com.crowdin.cli.commands.functionality.FsFiles;
+import com.crowdin.cli.properties.ProjectProperties;
+import com.crowdin.cli.utils.PlaceholderUtil;
+import com.crowdin.cli.utils.Utils;
+import com.crowdin.cli.utils.console.ConsoleSpinner;
+import com.crowdin.client.languages.model.Language;
+import com.crowdin.client.projectsgroups.model.Type;
+import com.crowdin.client.sourcefiles.model.FileInfo;
+import com.crowdin.client.translations.model.BuildProjectFileTranslationRequest;
+import lombok.AllArgsConstructor;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Objects;
+
+import static com.crowdin.cli.BaseCli.RESOURCE_BUNDLE;
+import static com.crowdin.cli.utils.console.ExecutionStatus.OK;
+import static com.crowdin.cli.utils.console.ExecutionStatus.WARNING;
+import static java.util.Objects.nonNull;
+
+@AllArgsConstructor
+public class FileDownloadTranslationAction implements NewAction<ProjectProperties, ProjectClient> {
+
+    private final String file;
+    private final String languageId;
+    private final String branch;
+    private final String dest;
+
+    @Override
+    public void act(Outputter out, ProjectProperties properties, ProjectClient client) {
+        CrowdinProjectFull project = ConsoleSpinner
+            .execute(out, "message.spinner.fetching_project_info", "error.collect_project_info",
+                false, false, client::downloadFullProject);
+        if (Objects.equals(project.getType(), Type.STRINGS_BASED)) {
+            out.println(WARNING.withIcon(RESOURCE_BUNDLE.getString("message.no_file_string_project")));
+            return;
+        }
+        if (!project.isManagerAccess()) {
+            out.println(WARNING.withIcon(RESOURCE_BUNDLE.getString("message.no_manager_access")));
+            return;
+        }
+
+        Language language = project.findLanguageById(languageId, true)
+            .orElseThrow(() -> new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.language_not_exist"), languageId)));
+
+        String branchPrefix = nonNull(branch) ? branch + Utils.PATH_SEPARATOR : "";
+        String sourcePath = Utils.toUnixPath(Utils.sepAtStart(branchPrefix + file));
+        FileInfo sourceFileInfo = project.getFileInfos().stream()
+            .filter(fi -> Objects.equals(sourcePath, fi.getPath()))
+            .findFirst()
+            .orElseThrow(() -> new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.file_not_found"), sourcePath)));
+        PlaceholderUtil placeholderUtil = new PlaceholderUtil(
+            project.getSupportedLanguages(),
+            project.getProjectLanguages(true),
+            properties.getBasePath()
+        );
+        BuildProjectFileTranslationRequest request = new BuildProjectFileTranslationRequest();
+        request.setTargetLanguageId(language.getId());
+
+        URL url = ConsoleSpinner.execute(
+            out,
+            "message.spinner.building_translation",
+            "error.building_translation",
+            false,
+            false,
+            () -> client.buildProjectFileTranslation(sourceFileInfo.getId(), request)
+        );
+        String destPath = nonNull(dest)
+            ? placeholderUtil.replaceLanguageDependentPlaceholders(dest + Utils.PATH_SEPARATOR + sourceFileInfo.getName(), language)
+            : languageId + sourcePath;
+        saveToFile(Utils.normalizePath(Utils.joinPaths(properties.getBasePath(), destPath)), url, out);
+        out.println(OK.withIcon(String.format(RESOURCE_BUNDLE.getString("message.downloaded_file"), destPath)));
+        out.println(WARNING.withIcon(RESOURCE_BUNDLE.getString("message.experimental_command")));
+    }
+
+    private void saveToFile(String destPath, URL url, Outputter out) {
+        ConsoleSpinner.execute(
+            out,
+            "message.spinner.downloading_translation",
+            "error.write_file",
+            false,
+            false,
+            () -> {
+                FilesInterface files = new FsFiles();
+                try (InputStream data = url.openStream()) {
+                    files.writeToFile(destPath, data);
+                } catch (IOException e) {
+                    throw new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.write_file"), destPath), e);
+                }
+                return url;
+            }
+        );
+    }
+}
diff --git a/src/main/java/com/crowdin/cli/commands/actions/FileUploadAction.java b/src/main/java/com/crowdin/cli/commands/actions/FileUploadAction.java
new file mode 100644
index 000000000..fb9a2f9c3
--- /dev/null
+++ b/src/main/java/com/crowdin/cli/commands/actions/FileUploadAction.java
@@ -0,0 +1,238 @@
+package com.crowdin.cli.commands.actions;
+
+import com.crowdin.cli.client.*;
+import com.crowdin.cli.commands.NewAction;
+import com.crowdin.cli.commands.Outputter;
+import com.crowdin.cli.commands.functionality.*;
+import com.crowdin.cli.properties.ProjectProperties;
+import com.crowdin.cli.utils.PlaceholderUtil;
+import com.crowdin.cli.utils.Utils;
+import com.crowdin.cli.utils.console.ConsoleSpinner;
+import com.crowdin.client.core.model.PatchRequest;
+import com.crowdin.client.labels.model.AddLabelRequest;
+import com.crowdin.client.labels.model.Label;
+import com.crowdin.client.languages.model.Language;
+import com.crowdin.client.projectsgroups.model.Type;
+import com.crowdin.client.sourcefiles.model.*;
+import com.crowdin.client.sourcestrings.model.UploadStringsProgress;
+import com.crowdin.client.sourcestrings.model.UploadStringsRequest;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.util.*;
+import java.util.stream.Collectors;
+
+import static com.crowdin.cli.BaseCli.RESOURCE_BUNDLE;
+import static com.crowdin.cli.utils.console.ExecutionStatus.*;
+import static java.util.Objects.nonNull;
+
+@AllArgsConstructor
+class FileUploadAction implements NewAction<ProjectProperties, ProjectClient> {
+
+    private final File file;
+    private final String branchName;
+    private final boolean autoUpdate;
+    private final List<String> labels;
+    private final String dest;
+    private final boolean cleanupMode;
+    private final boolean updateStrings;
+    private final List<String> excludedLanguages;
+    private final boolean plainView;
+
+    @Override
+    public void act(Outputter out, ProjectProperties properties, ProjectClient client) {
+        CrowdinProjectFull project = ConsoleSpinner.execute(out, "message.spinner.fetching_project_info", "error.collect_project_info",
+            this.plainView, this.plainView, client::downloadFullProject);
+        PlaceholderUtil placeholderUtil = new PlaceholderUtil(project.getSupportedLanguages(), project.getProjectLanguages(false), properties.getBasePath());
+
+        Optional<List<Long>> attachLabelIds = Optional.empty();
+        if (nonNull(labels) && !labels.isEmpty()) {
+            attachLabelIds = Optional.of(labels.stream().map(l -> getOrCreateLabel(l, client)).collect(Collectors.toList()));
+        }
+
+        String fileFullPath = file.getPath();
+        String fileDestName = file.getName();
+        if (Objects.equals(Type.FILES_BASED, project.getType())) {
+            String commonPath = SourcesUtils.getCommonPath(Collections.singletonList(this.file.getAbsolutePath()), properties.getBasePath());
+            final String filePath = (nonNull(dest))
+                ? PropertiesBeanUtils.prepareDest(dest, StringUtils.removeStart(file.getAbsolutePath(), properties.getBasePath()), placeholderUtil)
+                : StringUtils.removeStart(file.getAbsolutePath(), properties.getBasePath() + commonPath);
+            fileFullPath = (nonNull(branchName) ? branchName + Utils.PATH_SEPARATOR : "") + filePath;
+            fileDestName = fileFullPath.substring(fileFullPath.lastIndexOf(Utils.PATH_SEPARATOR) + 1);
+            Map<String, FileInfo> paths = ProjectFilesUtils.buildFilePaths(project.getDirectories(), project.getBranches(), project.getFileInfos());
+            FileInfo projectFile = paths.get(fileFullPath);
+
+            if (nonNull(projectFile)) {
+                if (!autoUpdate) {
+                    out.println(SKIPPED.withIcon(String.format(RESOURCE_BUNDLE.getString("error.file_already_exists"), fileFullPath)));
+                    return;
+                }
+                final UpdateFileRequest request = new UpdateFileRequest();
+                final Long sourceId = projectFile.getId();
+                attachLabelIds.ifPresent(request::setAttachLabelIds);
+
+                Long storageId = getStorageId(client, fileDestName);
+                request.setStorageId(storageId);
+
+                try {
+                    client.updateSource(sourceId, request);
+                    if (nonNull(excludedLanguages) && !excludedLanguages.isEmpty()) {
+                        List<String> projectFileExcludedTargetLanguages = ((com.crowdin.client.sourcefiles.model.File) projectFile).getExcludedTargetLanguages();
+                        if (!Objects.equals(excludedLanguages, projectFileExcludedTargetLanguages)) {
+                            List<PatchRequest> editRequest = RequestBuilder.updateExcludedTargetLanguages(excludedLanguages);
+                            client.editSource(sourceId, editRequest);
+                        }
+                    }
+                    if (!plainView) {
+                        out.println(
+                            OK.withIcon(String.format(RESOURCE_BUNDLE.getString("message.uploading_file"), fileFullPath)));
+                    } else {
+                        out.println(fileFullPath);
+                    }
+                } catch (FileInUpdateException e) {
+                    if (!plainView) {
+                        out.println(
+                            SKIPPED.withIcon(String.format(RESOURCE_BUNDLE.getString("message.file_being_updated"), fileFullPath)));
+                    } else {
+                        out.println(RESOURCE_BUNDLE.getString("message.file_being_updated"));
+                    }
+                } catch (Exception e) {
+                    throw new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.uploading_file"), fileFullPath), e);
+                }
+                return;
+            }
+        }
+
+        Optional<Branch> branch = Optional.empty();
+        if (StringUtils.isNotEmpty(branchName)) {
+            branch = Optional.ofNullable(BranchUtils.getOrCreateBranch(out, branchName, client, project, plainView));
+        } else if (Objects.equals(Type.STRINGS_BASED, project.getType())) {
+            throw new RuntimeException(RESOURCE_BUNDLE.getString("error.branch_required_string_project"));
+        }
+
+        Long storageId = getStorageId(client, fileDestName);
+
+        Optional<List<String>> excludedLanguageNames = Optional.empty();
+        if (nonNull(excludedLanguages) && !excludedLanguages.isEmpty()) {
+            excludedLanguageNames = Optional.of(filterExcludedLanguages(excludedLanguages, project));
+        }
+
+        if (Objects.equals(Type.FILES_BASED, project.getType())) {
+            AddFileRequest request = new AddFileRequest();
+            request.setName(fileDestName);
+            request.setStorageId(storageId);
+
+            Optional<Long> directoryId = getOrCreateDirectoryId(out, client, project, properties, branch.orElse(null));
+            directoryId.ifPresent(request::setDirectoryId);
+
+            attachLabelIds.ifPresent(request::setAttachLabelIds);
+            branch.ifPresent(b -> request.setBranchId(b.getId()));
+            excludedLanguageNames.ifPresent(request::setExcludedTargetLanguages);
+            try {
+                client.addSource(request);
+            } catch (ExistsResponseException e) {
+                throw new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.file_already_exists"), fileFullPath));
+            } catch (Exception e) {
+                throw new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.uploading_file"), fileFullPath), e);
+            }
+
+        }
+        if (Objects.equals(Type.STRINGS_BASED, project.getType())) {
+            UploadStringsRequest request = new UploadStringsRequest();
+            request.setBranchId(branch.orElseThrow(() -> new RuntimeException(RESOURCE_BUNDLE.getString("error.branch_required_string_project"))).getId());
+            request.setCleanupMode(cleanupMode);
+            attachLabelIds.ifPresent(request::setLabelIds);
+            request.setUpdateStrings(updateStrings);
+            request.setStorageId(storageId);
+            ConsoleSpinner.execute(
+                out,
+                "message.spinner.uploading_strings",
+                "message.spinner.upload_strings_failed",
+                this.plainView,
+                this.plainView,
+                () -> {
+                    UploadStringsProgress uploadStrings = client.addSourceStringsBased(request);
+                    String uploadId = uploadStrings.getIdentifier();
+
+                    while (!"finished".equalsIgnoreCase(uploadStrings.getStatus())) {
+                        ConsoleSpinner.update(
+                            String.format(RESOURCE_BUNDLE.getString("message.spinner.uploading_strings_percents"),
+                                uploadStrings.getProgress()));
+                        Thread.sleep(1000);
+
+                        uploadStrings = client.getUploadStringsStatus(uploadId);
+
+                        if ("failed".equalsIgnoreCase(uploadStrings.getStatus())) {
+                            throw new RuntimeException(RESOURCE_BUNDLE.getString("message.spinner.upload_strings_failed"));
+                        }
+                    }
+                    ConsoleSpinner.update(String.format(RESOURCE_BUNDLE.getString("message.spinner.uploading_strings_percents"), 100));
+                    return uploadStrings;
+                });
+        }
+        if (!plainView) {
+            out.println(OK.withIcon(String.format(RESOURCE_BUNDLE.getString("message.uploading_file"), fileFullPath)));
+        } else {
+            out.println(fileFullPath);
+        }
+        out.println(WARNING.withIcon(RESOURCE_BUNDLE.getString("message.experimental_command")));
+    }
+
+    private List<String> filterExcludedLanguages(List<String> excludedLanguages, CrowdinProjectFull project) {
+        List<String> projectLanguageNames = project.getProjectLanguages(false)
+            .stream()
+            .map(Language::getId)
+            .collect(Collectors.toList());
+
+        return excludedLanguages
+            .stream()
+            .filter(projectLanguageNames::contains)
+            .collect(Collectors.toList());
+    }
+
+    private Long getOrCreateLabel(String labelName, ProjectClient client) {
+        Map<String, Long> labelList = client.listLabels().stream()
+            .collect(Collectors.toMap(Label::getTitle, Label::getId));
+        if (labelList.containsKey(labelName)) return labelList.get(labelName);
+        else {
+            AddLabelRequest request = new AddLabelRequest();
+            request.setTitle(labelName);
+            Label createdLabel = client.addLabel(request);
+            return createdLabel.getId();
+        }
+    }
+
+    private Optional<Long> getOrCreateDirectoryId(Outputter out, ProjectClient client, CrowdinProjectFull project, ProjectProperties properties, Branch branch) {
+        Optional<Long> directoryId;
+        Map<String, Long> directoryPaths = ProjectFilesUtils.buildDirectoryPaths(project.getDirectories(), project.getBranches())
+            .entrySet().stream().collect(Collectors.toMap(Map.Entry::getValue, Map.Entry::getKey));
+        String commonPath = SourcesUtils.getCommonPath(Collections.singletonList(this.file.getAbsolutePath()), properties.getBasePath());
+        PlaceholderUtil placeholderUtil = new PlaceholderUtil(project.getSupportedLanguages(), project.getProjectLanguages(false), properties.getBasePath());
+        String filePath = (nonNull(dest))
+            ? PropertiesBeanUtils.prepareDest(dest, StringUtils.removeStart(this.file.getAbsolutePath(), properties.getBasePath()), placeholderUtil)
+            : StringUtils.removeStart(this.file.getAbsolutePath(), properties.getBasePath() + commonPath);
+        try {
+            directoryId = Optional.ofNullable(ProjectUtils.createPath(out, client, directoryPaths, filePath, branch, this.plainView));
+        } catch (Exception e) {
+            throw new RuntimeException(RESOURCE_BUNDLE.getString("error.creating_directories"), e);
+        }
+        return directoryId;
+    }
+
+    private Long getStorageId(ProjectClient client, String fileName) {
+        try (InputStream fileStream = Files.newInputStream(file.toPath())) {
+            return client.uploadStorage(fileName, fileStream);
+        } catch (FileNotFoundException e) {
+            throw new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.local_file_not_found"), file.getAbsolutePath()));
+        } catch (EmptyFileException e){
+            throw new RuntimeException(String.format(RESOURCE_BUNDLE.getString("message.uploading_file_skipped"), file.getAbsolutePath()));
+        } catch (Exception e) {
+            throw new RuntimeException(
+                String.format(RESOURCE_BUNDLE.getString("error.upload_to_storage"), file.getAbsolutePath()), e);
+        }
+    }
+}
diff --git a/src/main/java/com/crowdin/cli/commands/actions/FileUploadTranslationAction.java b/src/main/java/com/crowdin/cli/commands/actions/FileUploadTranslationAction.java
new file mode 100644
index 000000000..5dd5b7e43
--- /dev/null
+++ b/src/main/java/com/crowdin/cli/commands/actions/FileUploadTranslationAction.java
@@ -0,0 +1,97 @@
+package com.crowdin.cli.commands.actions;
+
+import com.crowdin.cli.client.CrowdinProjectFull;
+import com.crowdin.cli.client.EmptyFileException;
+import com.crowdin.cli.client.ProjectClient;
+import com.crowdin.cli.commands.NewAction;
+import com.crowdin.cli.commands.Outputter;
+import com.crowdin.cli.commands.functionality.BranchUtils;
+import com.crowdin.cli.properties.ProjectProperties;
+import com.crowdin.cli.utils.Utils;
+import com.crowdin.cli.utils.console.ConsoleSpinner;
+import com.crowdin.client.projectsgroups.model.Type;
+import com.crowdin.client.sourcefiles.model.Branch;
+import com.crowdin.client.sourcefiles.model.FileInfo;
+import com.crowdin.client.translations.model.UploadTranslationsRequest;
+import com.crowdin.client.translations.model.UploadTranslationsStringsRequest;
+import lombok.AllArgsConstructor;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.util.Objects;
+
+import static com.crowdin.cli.BaseCli.RESOURCE_BUNDLE;
+import static com.crowdin.cli.utils.console.ExecutionStatus.OK;
+import static com.crowdin.cli.utils.console.ExecutionStatus.WARNING;
+
+@AllArgsConstructor
+public class FileUploadTranslationAction implements NewAction<ProjectProperties, ProjectClient> {
+
+    private final File file;
+    private final String branchName;
+    private final String dest;
+    private final String languageId;
+    private final boolean plainView;
+
+    @Override
+    public void act(Outputter out, ProjectProperties properties, ProjectClient client) {
+        CrowdinProjectFull project = ConsoleSpinner.execute(out, "message.spinner.fetching_project_info", "error.collect_project_info",
+            this.plainView, this.plainView, () -> client.downloadFullProject(branchName));
+
+        if (!project.findLanguageById(languageId, true).isPresent()) {
+            throw new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.language_not_exist"), languageId));
+        }
+
+        if (Objects.equals(Type.FILES_BASED, project.getType())) {
+            if (Objects.isNull(dest))
+                throw new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.file.dest_required"), languageId));
+            String sourcePath = Utils.toUnixPath(Utils.sepAtStart(dest));
+            FileInfo sourceFileInfo = project.getFileInfos().stream()
+                .filter(fi -> Objects.equals(sourcePath, fi.getPath()))
+                .findFirst()
+                .orElseThrow(() -> new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.file_not_found"), sourcePath)));
+
+            UploadTranslationsRequest request = new UploadTranslationsRequest();
+            Long storageId = getStorageId(client);
+            request.setFileId(sourceFileInfo.getId());
+            request.setStorageId(storageId);
+            try {
+                client.uploadTranslations(languageId, request);
+            } catch (Exception e) {
+                throw new RuntimeException(String.format(
+                    RESOURCE_BUNDLE.getString("error.upload_translation"), file.getPath()), e);
+            }
+        } else if (Objects.equals(Type.STRINGS_BASED, project.getType())) {
+            UploadTranslationsStringsRequest request = new UploadTranslationsStringsRequest();
+            Branch branch = project.findBranchByName(branchName)
+                .orElseThrow(() -> new RuntimeException(RESOURCE_BUNDLE.getString("error.branch_required_string_project")));
+            Long storageId = getStorageId(client);
+            request.setBranchId(branch.getId());
+            request.setStorageId(storageId);
+            client.uploadTranslationStringsBased(languageId, request);
+        }
+
+        if (!plainView) {
+            out.println(OK.withIcon(String.format(
+                RESOURCE_BUNDLE.getString("message.translation_uploaded"), file.getPath())));
+        } else {
+            out.println(file.getPath());
+        }
+        out.println(WARNING.withIcon(RESOURCE_BUNDLE.getString("message.experimental_command")));
+    }
+
+    private Long getStorageId(ProjectClient client) {
+        try (InputStream fileStream = Files.newInputStream(file.toPath())) {
+            return client.uploadStorage(file.getName(), fileStream);
+        } catch (FileNotFoundException e) {
+            throw new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.local_file_not_found"), file.getAbsolutePath()));
+        } catch (EmptyFileException e){
+            throw new RuntimeException(String.format(RESOURCE_BUNDLE.getString("message.uploading_file_skipped"), file.getAbsolutePath()));
+        } catch (Exception e) {
+            throw new RuntimeException(
+                String.format(RESOURCE_BUNDLE.getString("error.upload_to_storage"), file.getAbsolutePath()), e);
+        }
+    }
+}
diff --git a/src/main/java/com/crowdin/cli/commands/actions/TaskAddAction.java b/src/main/java/com/crowdin/cli/commands/actions/TaskAddAction.java
index 84f0936a9..bdde8afae 100644
--- a/src/main/java/com/crowdin/cli/commands/actions/TaskAddAction.java
+++ b/src/main/java/com/crowdin/cli/commands/actions/TaskAddAction.java
@@ -13,10 +13,7 @@
 import com.crowdin.cli.utils.Utils;
 import com.crowdin.cli.utils.console.ConsoleSpinner;
 import com.crowdin.client.sourcefiles.model.FileInfo;
-import com.crowdin.client.tasks.model.AddTaskRequest;
-import com.crowdin.client.tasks.model.CrowdinTaskCreateFormRequest;
-import com.crowdin.client.tasks.model.EnterpriseTaskCreateFormRequest;
-import com.crowdin.client.tasks.model.Task;
+import com.crowdin.client.tasks.model.*;
 
 import lombok.AllArgsConstructor;
 
@@ -96,26 +93,26 @@ public void act(Outputter out, ProjectProperties pb, ClientTask client) {
         }
 
         if (isOrganization) {
-            addTaskRequest = new EnterpriseTaskCreateFormRequest();
-            Optional.ofNullable(title).ifPresent(value -> ((EnterpriseTaskCreateFormRequest) addTaskRequest).setTitle(value));
-            Optional.ofNullable(language).ifPresent(value -> ((EnterpriseTaskCreateFormRequest) addTaskRequest).setLanguageId(value));
-            Optional.ofNullable(fileIds).ifPresent(value -> ((EnterpriseTaskCreateFormRequest) addTaskRequest).setFileIds(value));
-            Optional.ofNullable(description).ifPresent(value -> ((EnterpriseTaskCreateFormRequest) addTaskRequest).setDescription(value));
-            Optional.ofNullable(skipAssignedStrings).ifPresent(value -> ((EnterpriseTaskCreateFormRequest) addTaskRequest).setSkipAssignedStrings(value));
-            Optional.ofNullable(includePreTranslatedStringsOnly).ifPresent(value -> ((EnterpriseTaskCreateFormRequest) addTaskRequest).setIncludePreTranslatedStringsOnly(value));
-            Optional.ofNullable(labels).ifPresent(value -> ((EnterpriseTaskCreateFormRequest) addTaskRequest).setLabelIds(value));
-            Optional.ofNullable(workflowStep).ifPresent(value -> ((EnterpriseTaskCreateFormRequest) addTaskRequest).setWorkflowStepId(value));
+            addTaskRequest = new CreateTaskEnterpriseRequest();
+            Optional.ofNullable(title).ifPresent(value -> ((CreateTaskEnterpriseRequest) addTaskRequest).setTitle(value));
+            Optional.ofNullable(language).ifPresent(value -> ((CreateTaskEnterpriseRequest) addTaskRequest).setLanguageId(value));
+            Optional.ofNullable(fileIds).ifPresent(value -> ((CreateTaskEnterpriseRequest) addTaskRequest).setFileIds(value));
+            Optional.ofNullable(description).ifPresent(value -> ((CreateTaskEnterpriseRequest) addTaskRequest).setDescription(value));
+            Optional.ofNullable(skipAssignedStrings).ifPresent(value -> ((CreateTaskEnterpriseRequest) addTaskRequest).setSkipAssignedStrings(value));
+            Optional.ofNullable(includePreTranslatedStringsOnly).ifPresent(value -> ((CreateTaskEnterpriseRequest) addTaskRequest).setIncludePreTranslatedStringsOnly(value));
+            Optional.ofNullable(labels).ifPresent(value -> ((CreateTaskEnterpriseRequest) addTaskRequest).setLabelIds(value));
+            Optional.ofNullable(workflowStep).ifPresent(value -> ((CreateTaskEnterpriseRequest) addTaskRequest).setWorkflowStepId(value));
         } else {
-            addTaskRequest = new CrowdinTaskCreateFormRequest();
-            Optional.ofNullable(title).ifPresent(value -> ((CrowdinTaskCreateFormRequest) addTaskRequest).setTitle(value));
-            Optional.ofNullable(type).ifPresent(value -> ((CrowdinTaskCreateFormRequest) addTaskRequest).setType(value));
-            Optional.ofNullable(language).ifPresent(value -> ((CrowdinTaskCreateFormRequest) addTaskRequest).setLanguageId(value));
-            Optional.ofNullable(fileIds).ifPresent(value -> ((CrowdinTaskCreateFormRequest) addTaskRequest).setFileIds(value));
-            Optional.ofNullable(description).ifPresent(value -> ((CrowdinTaskCreateFormRequest) addTaskRequest).setDescription(value));
-            Optional.ofNullable(skipAssignedStrings).ifPresent(value -> ((CrowdinTaskCreateFormRequest) addTaskRequest).setSkipAssignedStrings(value));
-            Optional.ofNullable(skipUntranslatedStrings).ifPresent(value -> ((CrowdinTaskCreateFormRequest) addTaskRequest).setSkipUntranslatedStrings(value));
-            Optional.ofNullable(includePreTranslatedStringsOnly).ifPresent(value -> ((CrowdinTaskCreateFormRequest) addTaskRequest).setIncludePreTranslatedStringsOnly(value));
-            Optional.ofNullable(labels).ifPresent(value -> ((CrowdinTaskCreateFormRequest) addTaskRequest).setLabelIds(value));
+            addTaskRequest = new CreateTaskRequest();
+            Optional.ofNullable(title).ifPresent(value -> ((CreateTaskRequest) addTaskRequest).setTitle(value));
+            Optional.ofNullable(type).ifPresent(value -> ((CreateTaskRequest) addTaskRequest).setType(Type.from(String.valueOf(value))));
+            Optional.ofNullable(language).ifPresent(value -> ((CreateTaskRequest) addTaskRequest).setLanguageId(value));
+            Optional.ofNullable(fileIds).ifPresent(value -> ((CreateTaskRequest) addTaskRequest).setFileIds(value));
+            Optional.ofNullable(description).ifPresent(value -> ((CreateTaskRequest) addTaskRequest).setDescription(value));
+            Optional.ofNullable(skipAssignedStrings).ifPresent(value -> ((CreateTaskRequest) addTaskRequest).setSkipAssignedStrings(value));
+            Optional.ofNullable(skipUntranslatedStrings).ifPresent(value -> ((CreateTaskRequest) addTaskRequest).setSkipUntranslatedStrings(value));
+            Optional.ofNullable(includePreTranslatedStringsOnly).ifPresent(value -> ((CreateTaskRequest) addTaskRequest).setIncludePreTranslatedStringsOnly(value));
+            Optional.ofNullable(labels).ifPresent(value -> ((CreateTaskRequest) addTaskRequest).setLabelIds(value));
         }
 
         try {
diff --git a/src/main/java/com/crowdin/cli/commands/actions/UploadSourcesAction.java b/src/main/java/com/crowdin/cli/commands/actions/UploadSourcesAction.java
index e22987139..cd31356c6 100644
--- a/src/main/java/com/crowdin/cli/commands/actions/UploadSourcesAction.java
+++ b/src/main/java/com/crowdin/cli/commands/actions/UploadSourcesAction.java
@@ -8,12 +8,7 @@
 import com.crowdin.cli.commands.NewAction;
 import com.crowdin.cli.commands.Outputter;
 import com.crowdin.cli.commands.actions.subactions.DeleteObsoleteProjectFilesSubAction;
-import com.crowdin.cli.commands.functionality.ProjectFilesUtils;
-import com.crowdin.cli.commands.functionality.ProjectUtils;
-import com.crowdin.cli.commands.functionality.PropertiesBeanUtils;
-import com.crowdin.cli.commands.functionality.RequestBuilder;
-import com.crowdin.cli.commands.functionality.SourcesUtils;
-import com.crowdin.cli.commands.functionality.TranslationsUtils;
+import com.crowdin.cli.commands.functionality.*;
 import com.crowdin.cli.properties.FileBean;
 import com.crowdin.cli.properties.PropertiesWithFiles;
 import com.crowdin.cli.utils.PlaceholderUtil;
@@ -94,7 +89,7 @@ public void act(Outputter out, PropertiesWithFiles pb, ProjectClient client) {
 
         PlaceholderUtil placeholderUtil = new PlaceholderUtil(project.getSupportedLanguages(), project.getProjectLanguages(false), pb.getBasePath());
 
-        Branch branch = (branchName != null) ? this.getOrCreateBranch(out, branchName, client, project) : null;
+        Branch branch = (branchName != null) ? BranchUtils.getOrCreateBranch(out, branchName, client, project, plainView) : null;
         Long branchId = (branch != null) ? branch.getId() : null;
 
         Map<String, Long> directoryPaths = ProjectFilesUtils.buildDirectoryPaths(project.getDirectories(), project.getBranches())
@@ -390,28 +385,6 @@ private ExportOptions buildExportOptions(java.io.File sourceFile, FileBean fileB
         }
     }
 
-    private Branch getOrCreateBranch(Outputter out, String branchName, ProjectClient client, CrowdinProjectFull project) {
-        if (StringUtils.isEmpty(branchName)) {
-            return null;
-        }
-        Optional<Branch> branchOpt = project.findBranchByName(branchName);
-        if (branchOpt.isPresent()) {
-            if (!plainView) {
-                out.println(SKIPPED.withIcon(String.format(RESOURCE_BUNDLE.getString("message.branch_already_exists"), branchName)));
-            }
-            return branchOpt.get();
-        } else {
-            AddBranchRequest request = new AddBranchRequest();
-            request.setName(branchName);
-            Branch newBranch = client.addBranch(request);
-            if (!plainView) {
-                out.println(ExecutionStatus.OK.withIcon(String.format(RESOURCE_BUNDLE.getString("message.branch"), branchName)));
-            }
-            project.addBranchToLocalList(newBranch);
-            return newBranch;
-        }
-    }
-
     private void checkExcludedTargetLanguages(List<String> excludedTargetLanguages, List<Language> supportedLanguages, List<Language> projectLanguages) {
         if (excludedTargetLanguages != null && !excludedTargetLanguages.isEmpty()) {
             List<String> supportedLanguageIds = supportedLanguages.stream()
diff --git a/src/main/java/com/crowdin/cli/commands/functionality/BranchUtils.java b/src/main/java/com/crowdin/cli/commands/functionality/BranchUtils.java
new file mode 100644
index 000000000..98a368bd6
--- /dev/null
+++ b/src/main/java/com/crowdin/cli/commands/functionality/BranchUtils.java
@@ -0,0 +1,39 @@
+package com.crowdin.cli.commands.functionality;
+
+import com.crowdin.cli.client.CrowdinProjectFull;
+import com.crowdin.cli.client.ProjectClient;
+import com.crowdin.cli.commands.Outputter;
+import com.crowdin.cli.utils.console.ExecutionStatus;
+import com.crowdin.client.sourcefiles.model.AddBranchRequest;
+import com.crowdin.client.sourcefiles.model.Branch;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.Optional;
+
+import static com.crowdin.cli.BaseCli.RESOURCE_BUNDLE;
+import static com.crowdin.cli.utils.console.ExecutionStatus.SKIPPED;
+
+public class BranchUtils {
+
+    public static Branch getOrCreateBranch(Outputter out, String branchName, ProjectClient client, CrowdinProjectFull project, boolean plainView) {
+        if (StringUtils.isEmpty(branchName)) {
+            return null;
+        }
+        Optional<Branch> branchOpt = project.findBranchByName(branchName);
+        if (branchOpt.isPresent()) {
+            if (!plainView) {
+                out.println(SKIPPED.withIcon(String.format(RESOURCE_BUNDLE.getString("message.branch_already_exists"), branchName)));
+            }
+            return branchOpt.get();
+        } else {
+            AddBranchRequest request = new AddBranchRequest();
+            request.setName(branchName);
+            Branch newBranch = client.addBranch(request);
+            if (!plainView) {
+                out.println(ExecutionStatus.OK.withIcon(String.format(RESOURCE_BUNDLE.getString("message.branch"), branchName)));
+            }
+            project.addBranchToLocalList(newBranch);
+            return newBranch;
+        }
+    }
+}
diff --git a/src/main/java/com/crowdin/cli/commands/functionality/RequestBuilder.java b/src/main/java/com/crowdin/cli/commands/functionality/RequestBuilder.java
index 2f3156d24..51715fe5d 100644
--- a/src/main/java/com/crowdin/cli/commands/functionality/RequestBuilder.java
+++ b/src/main/java/com/crowdin/cli/commands/functionality/RequestBuilder.java
@@ -14,8 +14,8 @@
 import com.crowdin.client.sourcestrings.model.AddSourceStringRequest;
 import com.crowdin.client.stringcomments.model.AddStringCommentRequest;
 import com.crowdin.client.stringcomments.model.Type;
-import com.crowdin.client.tasks.model.CrowdinTaskCreateFormRequest;
-import com.crowdin.client.tasks.model.EnterpriseTaskCreateFormRequest;
+import com.crowdin.client.tasks.model.CreateTaskRequest;
+import com.crowdin.client.tasks.model.CreateTaskEnterpriseRequest;
 import com.crowdin.client.translationmemory.model.AddTranslationMemoryRequest;
 import com.crowdin.client.translationmemory.model.TranslationMemoryExportRequest;
 import com.crowdin.client.translationmemory.model.TranslationMemoryFormat;
@@ -68,8 +68,8 @@ public static AddDistributionRequest addDistribution(String name, ExportMode exp
         return request;
     }
 
-    public static CrowdinTaskCreateFormRequest addCrowdinTask(String title, Integer type, String languageId, List<Long> fileId, String description, boolean skipAssignedStrings, boolean skipUntranslatedStrings, boolean includePreTranslatedStringsOnly, List<Long> labelIds) {
-        CrowdinTaskCreateFormRequest request = new CrowdinTaskCreateFormRequest();
+    public static CreateTaskRequest addCrowdinTask(String title, com.crowdin.client.tasks.model.Type type, String languageId, List<Long> fileId, String description, boolean skipAssignedStrings, boolean skipUntranslatedStrings, boolean includePreTranslatedStringsOnly, List<Long> labelIds) {
+        CreateTaskRequest request = new CreateTaskRequest();
         request.setTitle(title);
         request.setType(type);
         request.setLanguageId(languageId);
@@ -82,8 +82,8 @@ public static CrowdinTaskCreateFormRequest addCrowdinTask(String title, Integer
         return request;
     }
 
-    public static EnterpriseTaskCreateFormRequest addEnterpriseTask(String title, String languageId, List<Long> fileId, String description, boolean skipAssignedStrings, boolean includePreTranslatedStringsOnly, List<Long> labelIds, Long workflowStepId) {
-        EnterpriseTaskCreateFormRequest request = new EnterpriseTaskCreateFormRequest();
+    public static CreateTaskEnterpriseRequest addEnterpriseTask(String title, String languageId, List<Long> fileId, String description, boolean skipAssignedStrings, boolean includePreTranslatedStringsOnly, List<Long> labelIds, Long workflowStepId) {
+        CreateTaskEnterpriseRequest request = new CreateTaskEnterpriseRequest();
         request.setTitle(title);
         request.setLanguageId(languageId);
         request.setFileIds(fileId);
diff --git a/src/main/java/com/crowdin/cli/commands/picocli/CommandNames.java b/src/main/java/com/crowdin/cli/commands/picocli/CommandNames.java
index bdc6bb210..4db2dc227 100644
--- a/src/main/java/com/crowdin/cli/commands/picocli/CommandNames.java
+++ b/src/main/java/com/crowdin/cli/commands/picocli/CommandNames.java
@@ -79,4 +79,9 @@ public final class CommandNames {
     public static final String LABEL_LIST = "list";
     public static final String LABEL_ADD = "add";
     public static final String LABEL_DELETE = "delete";
+
+    public static final String FILE = "file";
+    public static final String FILE_UPLOAD = "upload";
+    public static final String FILE_DOWNLOAD = "download";
+    public static final String FILE_DELETE = "delete";
 }
diff --git a/src/main/java/com/crowdin/cli/commands/picocli/FileDeleteSubcommand.java b/src/main/java/com/crowdin/cli/commands/picocli/FileDeleteSubcommand.java
new file mode 100644
index 000000000..dcfed54c4
--- /dev/null
+++ b/src/main/java/com/crowdin/cli/commands/picocli/FileDeleteSubcommand.java
@@ -0,0 +1,27 @@
+package com.crowdin.cli.commands.picocli;
+
+import com.crowdin.cli.client.ProjectClient;
+import com.crowdin.cli.commands.Actions;
+import com.crowdin.cli.commands.NewAction;
+import com.crowdin.cli.properties.ProjectProperties;
+import picocli.CommandLine;
+import picocli.CommandLine.Command;
+import picocli.CommandLine.Parameters;
+
+@Command(
+    name = CommandNames.FILE_DELETE,
+    sortOptions = false
+)
+class FileDeleteSubcommand extends ActCommandProject {
+
+    @Parameters(descriptionKey = "crowdin.file.delete.file")
+    protected String file;
+
+    @CommandLine.Option(names = {"-b", "--branch"}, paramLabel = "...", order = -2)
+    protected String branch;
+
+    @Override
+    protected NewAction<ProjectProperties, ProjectClient> getAction(Actions actions) {
+        return actions.fileDelete(file, branch);
+    }
+}
diff --git a/src/main/java/com/crowdin/cli/commands/picocli/FileDownloadSubcommand.java b/src/main/java/com/crowdin/cli/commands/picocli/FileDownloadSubcommand.java
new file mode 100644
index 000000000..911f57ba1
--- /dev/null
+++ b/src/main/java/com/crowdin/cli/commands/picocli/FileDownloadSubcommand.java
@@ -0,0 +1,37 @@
+package com.crowdin.cli.commands.picocli;
+
+import com.crowdin.cli.client.ProjectClient;
+import com.crowdin.cli.commands.Actions;
+import com.crowdin.cli.commands.NewAction;
+import com.crowdin.cli.properties.ProjectProperties;
+import picocli.CommandLine.Command;
+import picocli.CommandLine.Option;
+import picocli.CommandLine.Parameters;
+
+import java.util.Objects;
+
+@Command(
+    name = CommandNames.FILE_DOWNLOAD,
+    sortOptions = false
+)
+class FileDownloadSubcommand extends ActCommandProject {
+
+    @Parameters(descriptionKey = "crowdin.file.download.file")
+    protected String file;
+
+    @Option(names = {"-l", "--language"}, paramLabel = "...", descriptionKey = "crowdin.file.language", order = -2)
+    protected String languageId;
+
+    @Option(names = {"-b", "--branch"}, paramLabel = "...", order = -2)
+    protected String branch;
+
+    @Option(names = {"-d", "--dest"}, paramLabel = "...", descriptionKey = "crowdin.file.download.dest", order = -2)
+    private String destination;
+
+    @Override
+    protected NewAction<ProjectProperties, ProjectClient> getAction(Actions actions) {
+        if (Objects.nonNull(languageId))
+            return actions.fileDownloadTranslation(file, languageId, branch, destination);
+        return actions.fileDownload(file, branch, destination);
+    }
+}
diff --git a/src/main/java/com/crowdin/cli/commands/picocli/FileSubcommand.java b/src/main/java/com/crowdin/cli/commands/picocli/FileSubcommand.java
new file mode 100644
index 000000000..23defc37b
--- /dev/null
+++ b/src/main/java/com/crowdin/cli/commands/picocli/FileSubcommand.java
@@ -0,0 +1,20 @@
+package com.crowdin.cli.commands.picocli;
+
+import picocli.CommandLine;
+import picocli.CommandLine.Command;
+
+@Command(
+    name = CommandNames.FILE,
+    subcommands = {
+        FileUploadSubcommand.class,
+        FileDownloadSubcommand.class,
+        FileDeleteSubcommand.class
+    }
+)
+class FileSubcommand extends HelpCommand {
+
+    @Override
+    protected CommandLine getCommand(CommandLine rootCommand) {
+        return rootCommand.getSubcommands().get(CommandNames.FILE);
+    }
+}
diff --git a/src/main/java/com/crowdin/cli/commands/picocli/FileUploadSubcommand.java b/src/main/java/com/crowdin/cli/commands/picocli/FileUploadSubcommand.java
new file mode 100644
index 000000000..471c74f92
--- /dev/null
+++ b/src/main/java/com/crowdin/cli/commands/picocli/FileUploadSubcommand.java
@@ -0,0 +1,58 @@
+package com.crowdin.cli.commands.picocli;
+
+import com.crowdin.cli.client.ProjectClient;
+import com.crowdin.cli.commands.Actions;
+import com.crowdin.cli.commands.NewAction;
+import com.crowdin.cli.properties.ProjectProperties;
+import picocli.CommandLine;
+import picocli.CommandLine.Option;
+import picocli.CommandLine.Parameters;
+
+import java.io.File;
+import java.util.List;
+import java.util.Objects;
+
+@CommandLine.Command(
+    name = CommandNames.FILE_UPLOAD,
+    sortOptions = false
+)
+class FileUploadSubcommand extends ActCommandProject {
+
+    @Parameters(descriptionKey = "crowdin.file.upload.file")
+    protected File file;
+
+    @Option(names = {"-b", "--branch"}, paramLabel = "...", order = -2)
+    protected String branch;
+
+    @Option(names = {"--no-auto-update"}, descriptionKey = "crowdin.file.upload.auto-update", negatable = true, order = -2)
+    protected boolean autoUpdate = true;
+
+    @Option(names = {"--label"}, descriptionKey = "params.label", paramLabel = "...", order = -2)
+    protected List<String> labels;
+
+    @Option(names = {"-d", "--dest"}, paramLabel = "...", descriptionKey = "crowdin.file.upload.dest", order = -2)
+    private String destination;
+
+    @Option(names = {"--excluded-language"}, descriptionKey = "params.excluded-languages", paramLabel = "...", order = -2)
+    protected List<String> excludedLanguages;
+
+    @Option(names = {"--cleanup-mode"}, negatable = true, descriptionKey = "crowdin.file.upload.cleanup-mode", order = -2)
+    protected boolean cleanupMode = false;
+
+    @Option(names = {"--update-strings"}, negatable = true, descriptionKey = "crowdin.file.upload.update-strings", order = -2)
+    protected boolean updateStrings = false;
+
+    @Option(names = {"-l", "--language"}, paramLabel = "...", descriptionKey = "crowdin.file.language", order = -2)
+    protected String languageId;
+
+    @Option(names = {"--plain"}, descriptionKey = "crowdin.list.usage.plain")
+    protected boolean plainView;
+
+    @Override
+    protected NewAction<ProjectProperties, ProjectClient> getAction(Actions actions) {
+        if (Objects.nonNull(languageId)) {
+            return actions.fileUploadTranslation(file, branch, destination, languageId, plainView);
+        }
+        return actions.fileUpload(file, branch, autoUpdate, labels, destination, excludedLanguages, plainView, cleanupMode, updateStrings);
+    }
+}
diff --git a/src/main/java/com/crowdin/cli/commands/picocli/RootCommand.java b/src/main/java/com/crowdin/cli/commands/picocli/RootCommand.java
index 48a6f6118..ac43ef92e 100644
--- a/src/main/java/com/crowdin/cli/commands/picocli/RootCommand.java
+++ b/src/main/java/com/crowdin/cli/commands/picocli/RootCommand.java
@@ -23,6 +23,7 @@
         DistributionSubcommand.class,
         ScreenshotSubcommand.class,
         LabelSubcommand.class,
+        FileSubcommand.class,
     })
 class RootCommand extends HelpCommand {
     @Override
diff --git a/src/main/resources/messages/messages.properties b/src/main/resources/messages/messages.properties
index 1594f9cc4..60a1af9bb 100755
--- a/src/main/resources/messages/messages.properties
+++ b/src/main/resources/messages/messages.properties
@@ -121,6 +121,31 @@ crowdin.upload.translations.auto-approve-imported=Approve added translations aut
 crowdin.upload.translations.import-eq-suggestions=Add translations even if they're the same as the source strings in your Crowdin project
 crowdin.upload.translations.translate-hidden=Upload translations to hidden source strings
 
+# CROWDIN FILE COMMAND
+crowdin.file.usage.description=Manage source files and translations in a Crowdin project
+crowdin.file.usage.customSynopsis=@|fg(green) crowdin file|@ [SUBCOMMAND] [CONFIG OPTIONS] [OPTIONS]
+crowdin.file.language=Target language identifier
+
+# CROWDIN FILE UPLOAD COMMAND
+crowdin.file.upload.usage.description=Upload a file to a Crowdin project
+crowdin.file.upload.usage.customSynopsis=@|fg(green) crowdin file upload|@ <file> [CONFIG OPTIONS] [OPTIONS]
+crowdin.file.upload.file=Path to file to upload
+crowdin.file.upload.dest=File destination in the Crowdin project
+crowdin.file.upload.auto-update=Specify whether to update the file in the Crowdin project if it already exists
+crowdin.file.upload.cleanup-mode=Specify whether to delete all strings with a system label that do not exist in the file
+crowdin.file.upload.update-strings=Specify whether to update strings that have the same keys
+
+# CROWDIN FILE DOWNLOAD COMMAND
+crowdin.file.download.usage.description=Download a file to a specified location
+crowdin.file.download.usage.customSynopsis=@|fg(green) crowdin file download|@ <file> [CONFIG OPTIONS] [OPTIONS]
+crowdin.file.download.file=Crowdin file path for download
+crowdin.file.download.dest=Path where the downloaded file should be saved
+
+# CROWDIN FILE DELETE COMMAND
+crowdin.file.delete.usage.description=Delete a file in a Crowdin project
+crowdin.file.delete.usage.customSynopsis=@|fg(green) crowdin file delete|@ <file> [CONFIG OPTIONS] [OPTIONS]
+crowdin.file.delete.file=Path to file in the Crowdin project
+
 # CROWDIN STATUS COMMAND
 crowdin.status.usage.description=Show translation and proofreading progress for a project
 crowdin.status.usage.customSynopsis=@|fg(green) crowdin status|@ [SUBCOMMAND] [CONFIG OPTIONS] [OPTIONS]
@@ -538,6 +563,8 @@ error.screenshot.not_updated=Screenshot was not updated
 
 error.label.not_found=Couldn't find label by the specified title
 
+error.file.dest_required='dest' parameter required to specify source file path
+
 error.response.401=Couldn't authorize. Check your 'api_token'
 error.response.403=You do not have permission to view/edit project with provided id
 error.response.403_upgrade_subscription=Please, upgrade your subscription plan to upload more file formats
@@ -585,10 +612,13 @@ error.spinner.pre_translate=Failed to pre-translate the project. Please contact
 error.spinner.reviewed_sources=Failed to load reviewed sources. Please contact our support team for help
 
 error.file_not_found=File '%s' not found in the Crowdin project
+error.local_file_not_found=File '%s' not found by the specified path
+error.branch_required_string_project=Branch is required for string-based projects
 
 message.new_version_text=New version of Crowdin CLI is available! %s -> %s
 message.new_version_text.2=Changelog: @|cyan https://github.com/crowdin/crowdin-cli/releases/latest|@
 message.new_version_text.3=Please update for the best experience!
+message.experimental_command=This command is experimental. Experimental features are not covered by semver and might change in the future. If you have any feedback, feel free to raise a discussion: https://github.com/crowdin/crowdin-cli/discussions
 message.uploading_file=File @|bold '%s'|@
 message.uploading_file_skipped=File @|bold '%s'|@ was skipped since it is empty
 message.file_being_updated=File @|bold '%s'|@ is currently being updated
@@ -638,6 +668,8 @@ message.no_target_to_exec=Couldn't find @|bold '%s'|@ target to download
 message.description=%s @|bold '%s'|@
 message.obsolete_file=Obsolete file @|bold '%s'|@
 message.file_id_deprecated=File id is deprecated and will be removed in future releases. Please use file path instead
+message.file_deleted=File @|bold '%s'|@ deleted
+message.no_file_string_project=File management is not available for string-based projects
 
 message.download_sources.preserve_hierarchy_warning=Because the @|bold 'preserve_hierarchy'|@ parameter is set to 'false':\n\t- CLI might download some unexpected files that match the pattern;\n\t- Source file hierarchy may not be preserved and will be the same as in Crowdin.
 message.download_translations.preserve_hierarchy_warning=Because the @|bold 'preserve_hierarchy'|@ parameter is set to 'false' CLI might download some unexpected files that match the pattern
@@ -723,9 +755,12 @@ message.warning.no_file_to_download=Couldn't find any file to download
 message.warning.no_file_to_download_skipuntranslated=Couldn't find any file to download. As you are using the 'Skip untranslated files' option, please make sure you have fully translated files
 message.warning.another_build_in_progress=Another build is currently in progress. Please wait until it's finished
 message.spinner.fetching_project_info=Fetching project info
-message.spinner.building_translation=Building translations
+message.spinner.building_translations=Building translations
+message.spinner.building_translation=Building translation
 message.spinner.building_reviewed_sources=Building reviewed sources
-message.spinner.downloading_translation=Downloading translations
+message.spinner.downloading_file=Downloading file
+message.spinner.downloading_translations=Downloading translations
+message.spinner.downloading_translation=Downloading translation
 message.spinner.downloading_reviewed_sources=Downloading reviewed sources
 message.spinner.extracting_archive=Extracting archive
 message.spinner.validating_project=Validating project
@@ -742,6 +777,9 @@ message.spinner.pre_translate=Pre-translation is running...
 message.spinner.pre_translate_percents=Pre-translation is completed by @|bold (%d%%)|@
 message.spinner.pre_translate_done=Pre-translation is finished @|bold (%d%%)|@
 message.spinner.build_has_failed=The build has failed
+message.spinner.uploading_strings=Uploading strings
+message.spinner.uploading_strings_percents=Uploading strings @|bold (%d%%)|@
+message.spinner.upload_strings_failed=Upload has failed
 
 message.faq_link=Visit the @|cyan https://crowdin.github.io/crowdin-cli/faq|@ for more details
 message.translations_build_unsuccessful=Didn't manage to build translations
diff --git a/src/test/java/com/crowdin/cli/client/CrowdinClientTaskTest.java b/src/test/java/com/crowdin/cli/client/CrowdinClientTaskTest.java
index 591485af0..fb9ac0e8f 100644
--- a/src/test/java/com/crowdin/cli/client/CrowdinClientTaskTest.java
+++ b/src/test/java/com/crowdin/cli/client/CrowdinClientTaskTest.java
@@ -61,7 +61,7 @@ public void testAddTask() {
         when(httpClientMock.post(eq(addTmUrl), any(), any(), eq(TaskResponseObject.class)))
                 .thenReturn(response);
 
-        client.addTask(new AddTaskRequest());
+        client.addTask(new CreateTaskRequest());
 
         verify(httpClientMock).post(eq(addTmUrl), any(), any(), eq(TaskResponseObject.class));
         verifyNoMoreInteractions(httpClientMock);
diff --git a/src/test/java/com/crowdin/cli/commands/actions/CliActionsTest.java b/src/test/java/com/crowdin/cli/commands/actions/CliActionsTest.java
index f513e67ee..c3fa94c98 100644
--- a/src/test/java/com/crowdin/cli/commands/actions/CliActionsTest.java
+++ b/src/test/java/com/crowdin/cli/commands/actions/CliActionsTest.java
@@ -156,4 +156,29 @@ void testLabelAdd() {
     void testLabelDelete() {
         assertNotNull(actions.labelDelete(null));
     }
+
+    @Test
+    void testFileUpload() {
+        assertNotNull(actions.fileUpload(null, null, false, null, null, null,false, true, false));
+    }
+
+    @Test
+    void testFileUploadTranslation() {
+        assertNotNull(actions.fileUploadTranslation(null, null, null, null,false));
+    }
+
+    @Test
+    void testFileDownload() {
+        assertNotNull(actions.fileDownload(null, null, null));
+    }
+
+    @Test
+    void testFileDownloadTranslation() {
+        assertNotNull(actions.fileDownloadTranslation(null, null,null, null));
+    }
+
+    @Test
+    void testFileDelete() {
+        assertNotNull(actions.fileDelete(null, null));
+    }
 }
diff --git a/src/test/java/com/crowdin/cli/commands/actions/FileDeleteActionTest.java b/src/test/java/com/crowdin/cli/commands/actions/FileDeleteActionTest.java
new file mode 100644
index 000000000..0c1de110a
--- /dev/null
+++ b/src/test/java/com/crowdin/cli/commands/actions/FileDeleteActionTest.java
@@ -0,0 +1,75 @@
+package com.crowdin.cli.commands.actions;
+
+import com.crowdin.cli.client.CrowdinProjectFull;
+import com.crowdin.cli.client.ProjectBuilder;
+import com.crowdin.cli.client.ProjectClient;
+import com.crowdin.cli.commands.NewAction;
+import com.crowdin.cli.commands.Outputter;
+import com.crowdin.cli.properties.NewPropertiesWithFilesUtilBuilder;
+import com.crowdin.cli.properties.ProjectProperties;
+import com.crowdin.cli.properties.PropertiesWithFiles;
+import com.crowdin.cli.properties.helper.FileHelperTest;
+import com.crowdin.cli.properties.helper.TempProject;
+import com.crowdin.cli.utils.Utils;
+import com.crowdin.client.projectsgroups.model.Type;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.*;
+
+class FileDeleteActionTest {
+    private TempProject project;
+
+    @BeforeEach
+    public void createProj() {
+        project = new TempProject(FileHelperTest.class);
+    }
+
+    @AfterEach
+    public void deleteProj() {
+        project.delete();
+    }
+
+    @Test
+    public void testDelete() {
+        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
+            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
+            .setBasePath(project.getBasePath());
+        PropertiesWithFiles pb = pbBuilder.build();
+        ProjectClient client = mock(ProjectClient.class);
+        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId()))
+            .addFile("/first.po", "gettext", 101L, null, null, null).build();
+        build.setType(Type.FILES_BASED);
+        when(client.downloadFullProject())
+            .thenReturn(build);
+
+        NewAction<ProjectProperties, ProjectClient> action = new FileDeleteAction("first.po", null);
+        action.act(Outputter.getDefault(), pb, client);
+
+        verify(client).downloadFullProject();
+        verify(client).deleteSource(eq(101L));
+        verifyNoMoreInteractions(client);
+    }
+
+    @Test
+    public void testDelete_StringBasedProject() {
+        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
+            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
+            .setBasePath(project.getBasePath());
+        PropertiesWithFiles pb = pbBuilder.build();
+        ProjectClient client = mock(ProjectClient.class);
+        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId()))
+            .addFile("/first.po", "gettext", 101L, null, null, null).build();
+        build.setType(Type.STRINGS_BASED);
+        when(client.downloadFullProject())
+            .thenReturn(build);
+
+        NewAction<ProjectProperties, ProjectClient> action = new FileDeleteAction("first.po", null);
+        action.act(Outputter.getDefault(), pb, client);
+
+        verify(client).downloadFullProject();
+        verifyNoMoreInteractions(client);
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/com/crowdin/cli/commands/actions/FileDownloadActionTest.java b/src/test/java/com/crowdin/cli/commands/actions/FileDownloadActionTest.java
new file mode 100644
index 000000000..723a1c4f0
--- /dev/null
+++ b/src/test/java/com/crowdin/cli/commands/actions/FileDownloadActionTest.java
@@ -0,0 +1,84 @@
+package com.crowdin.cli.commands.actions;
+
+import com.crowdin.cli.MockitoUtils;
+import com.crowdin.cli.client.CrowdinProjectFull;
+import com.crowdin.cli.client.ProjectBuilder;
+import com.crowdin.cli.client.ProjectClient;
+import com.crowdin.cli.commands.NewAction;
+import com.crowdin.cli.commands.Outputter;
+import com.crowdin.cli.properties.NewPropertiesWithFilesUtilBuilder;
+import com.crowdin.cli.properties.ProjectProperties;
+import com.crowdin.cli.properties.PropertiesWithFiles;
+import com.crowdin.cli.properties.helper.FileHelperTest;
+import com.crowdin.cli.properties.helper.TempProject;
+import com.crowdin.cli.utils.Utils;
+import com.crowdin.client.projectsgroups.model.Type;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.*;
+
+class FileDownloadActionTest {
+    private TempProject project;
+
+    @BeforeEach
+    public void createProj() {
+        project = new TempProject(FileHelperTest.class);
+    }
+
+    @AfterEach
+    public void deleteProj() {
+        project.delete();
+    }
+
+    @Test
+    public void testDownload() {
+        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
+            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
+            .setBasePath(project.getBasePath());
+        PropertiesWithFiles pb = pbBuilder.build();
+        ProjectClient client = mock(ProjectClient.class);
+        URL urlMock = MockitoUtils.getMockUrl(getClass());
+        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId()))
+            .addFile("/first.po", "gettext", 101L, null, null, null).build();
+        build.setType(Type.FILES_BASED);
+        when(client.downloadFullProject(any()))
+            .thenReturn(build);
+        when(client.downloadFile(eq(101L)))
+            .thenReturn(urlMock);
+
+        NewAction<ProjectProperties, ProjectClient> action = new FileDownloadAction("first.po", null, "dest");
+        action.act(Outputter.getDefault(), pb, client);
+
+        verify(client).downloadFullProject(any());
+        verify(client).downloadFile(eq(101L));
+        verifyNoMoreInteractions(client);
+        assertTrue(Files.exists(Paths.get(project.getBasePath() + "dest/first.po")), "File should exist at the specified path");
+    }
+
+    @Test
+    public void testDownload_StringBasedProject() {
+        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
+            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
+            .setBasePath(project.getBasePath());
+        PropertiesWithFiles pb = pbBuilder.build();
+        ProjectClient client = mock(ProjectClient.class);
+        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId())).build();
+        build.setType(Type.STRINGS_BASED);
+        when(client.downloadFullProject(any()))
+            .thenReturn(build);
+
+        NewAction<ProjectProperties, ProjectClient> action = new FileDownloadAction("first.po", "main", "dest");
+        action.act(Outputter.getDefault(), pb, client);
+
+        verify(client).downloadFullProject(any());
+        verifyNoMoreInteractions(client);
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/com/crowdin/cli/commands/actions/FileDownloadTranslationActionTest.java b/src/test/java/com/crowdin/cli/commands/actions/FileDownloadTranslationActionTest.java
new file mode 100644
index 000000000..05345d492
--- /dev/null
+++ b/src/test/java/com/crowdin/cli/commands/actions/FileDownloadTranslationActionTest.java
@@ -0,0 +1,117 @@
+package com.crowdin.cli.commands.actions;
+
+import com.crowdin.cli.MockitoUtils;
+import com.crowdin.cli.client.CrowdinProjectFull;
+import com.crowdin.cli.client.ProjectBuilder;
+import com.crowdin.cli.client.ProjectClient;
+import com.crowdin.cli.commands.NewAction;
+import com.crowdin.cli.commands.Outputter;
+import com.crowdin.cli.properties.NewPropertiesWithFilesUtilBuilder;
+import com.crowdin.cli.properties.ProjectProperties;
+import com.crowdin.cli.properties.PropertiesWithFiles;
+import com.crowdin.cli.properties.helper.FileHelperTest;
+import com.crowdin.cli.properties.helper.TempProject;
+import com.crowdin.cli.utils.Utils;
+import com.crowdin.client.projectsgroups.model.Type;
+import com.crowdin.client.translations.model.BuildProjectFileTranslationRequest;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.*;
+
+class FileDownloadTranslationActionTest {
+    private TempProject project;
+
+    @BeforeEach
+    public void createProj() {
+        project = new TempProject(FileHelperTest.class);
+    }
+
+    @AfterEach
+    public void deleteProj() {
+        project.delete();
+    }
+
+    @Test
+    public void testDownloadTranslation() {
+        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
+            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
+            .setBasePath(project.getBasePath());
+        PropertiesWithFiles pb = pbBuilder.build();
+        ProjectClient client = mock(ProjectClient.class);
+        URL urlMock = MockitoUtils.getMockUrl(getClass());
+        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId()))
+            .addFile("/first.po", "gettext", 101L, null, null, null).build();
+        build.setType(Type.FILES_BASED);
+        BuildProjectFileTranslationRequest request = new BuildProjectFileTranslationRequest() {{
+            setTargetLanguageId("ua");
+        }};
+        when(client.downloadFullProject())
+            .thenReturn(build);
+        when(client.buildProjectFileTranslation(eq(101L), eq(request)))
+            .thenReturn(urlMock);
+
+        NewAction<ProjectProperties, ProjectClient> action = new FileDownloadTranslationAction("first.po", "ua", null, null);
+        action.act(Outputter.getDefault(), pb, client);
+
+        verify(client).downloadFullProject();
+        verify(client).buildProjectFileTranslation(eq(101L), eq(request));
+        verifyNoMoreInteractions(client);
+        assertTrue(Files.exists(Paths.get(project.getBasePath() + "ua/first.po")), "File should exist at the specified path");
+    }
+
+    @Test
+    public void testDownloadTranslationWithDest() {
+        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
+            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
+            .setBasePath(project.getBasePath());
+        PropertiesWithFiles pb = pbBuilder.build();
+        ProjectClient client = mock(ProjectClient.class);
+        URL urlMock = MockitoUtils.getMockUrl(getClass());
+        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId()))
+            .addFile("/first.po", "gettext", 101L, null, null, null).build();
+        build.setType(Type.FILES_BASED);
+        BuildProjectFileTranslationRequest request = new BuildProjectFileTranslationRequest() {{
+            setTargetLanguageId("ua");
+        }};
+        when(client.downloadFullProject())
+            .thenReturn(build);
+        when(client.buildProjectFileTranslation(eq(101L), eq(request)))
+            .thenReturn(urlMock);
+
+        NewAction<ProjectProperties, ProjectClient> action = new FileDownloadTranslationAction("first.po", "ua", null, "path/to/save");
+        action.act(Outputter.getDefault(), pb, client);
+
+        verify(client).downloadFullProject();
+        verify(client).buildProjectFileTranslation(eq(101L), eq(request));
+        verifyNoMoreInteractions(client);
+        assertTrue(Files.exists(Paths.get(project.getBasePath() + "path/to/save/first.po")), "File should exist at the specified path");
+    }
+
+    @Test
+    public void testDownloadTranslation_StringBasedProject() {
+        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
+            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
+            .setBasePath(project.getBasePath());
+        PropertiesWithFiles pb = pbBuilder.build();
+        ProjectClient client = mock(ProjectClient.class);
+        URL urlMock = MockitoUtils.getMockUrl(getClass());
+        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId())).build();
+        build.setType(Type.STRINGS_BASED);
+        when(client.downloadFullProject())
+            .thenReturn(build);
+
+        NewAction<ProjectProperties, ProjectClient> action = new FileDownloadTranslationAction("first.po", "ua", null, "path/to/save");
+        action.act(Outputter.getDefault(), pb, client);
+
+        verify(client).downloadFullProject();
+        verifyNoMoreInteractions(client);
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/com/crowdin/cli/commands/actions/FileUploadActionTest.java b/src/test/java/com/crowdin/cli/commands/actions/FileUploadActionTest.java
new file mode 100644
index 000000000..ff3022963
--- /dev/null
+++ b/src/test/java/com/crowdin/cli/commands/actions/FileUploadActionTest.java
@@ -0,0 +1,359 @@
+package com.crowdin.cli.commands.actions;
+
+import com.crowdin.cli.client.CrowdinProjectFull;
+import com.crowdin.cli.client.ProjectBuilder;
+import com.crowdin.cli.client.ProjectClient;
+import com.crowdin.cli.client.ResponseException;
+import com.crowdin.cli.commands.NewAction;
+import com.crowdin.cli.commands.Outputter;
+import com.crowdin.cli.properties.NewPropertiesWithFilesUtilBuilder;
+import com.crowdin.cli.properties.ProjectProperties;
+import com.crowdin.cli.properties.PropertiesWithFiles;
+import com.crowdin.cli.properties.helper.FileHelperTest;
+import com.crowdin.cli.properties.helper.TempProject;
+import com.crowdin.cli.utils.Utils;
+import com.crowdin.client.labels.model.Label;
+import com.crowdin.client.projectsgroups.model.Type;
+import com.crowdin.client.sourcefiles.model.AddFileRequest;
+import com.crowdin.client.sourcefiles.model.Branch;
+import com.crowdin.client.sourcefiles.model.Directory;
+import com.crowdin.client.sourcefiles.model.UpdateFileRequest;
+import com.crowdin.client.sourcestrings.model.UploadStringsProgress;
+import com.crowdin.client.sourcestrings.model.UploadStringsRequest;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.Collections;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.*;
+
+class FileUploadActionTest {
+    private TempProject project;
+
+    @BeforeEach
+    public void createProj() {
+        project = new TempProject(FileHelperTest.class);
+    }
+
+    @AfterEach
+    public void deleteProj() {
+        project.delete();
+    }
+
+    @Test
+    public void testUpload_FileBasedProject() throws ResponseException {
+        File fileToUpload = new File(project.getBasePath() + "first.po");
+        project.addFile(Utils.normalizePath("first.po"), "Hello, World!");
+        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
+            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
+            .setBasePath(project.getBasePath());
+        PropertiesWithFiles pb = pbBuilder.build();
+        ProjectClient client = mock(ProjectClient.class);
+        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId())).build();
+        build.setType(Type.FILES_BASED);
+        when(client.downloadFullProject())
+            .thenReturn(build);
+        when(client.uploadStorage(eq("first.po"), any()))
+            .thenReturn(1L);
+
+        NewAction<ProjectProperties, ProjectClient> action = new FileUploadAction(fileToUpload, null, false, null, null, false, false, null, false);
+        action.act(Outputter.getDefault(), pb, client);
+
+        verify(client).downloadFullProject();
+        verify(client).uploadStorage(eq("first.po"), any());
+        AddFileRequest addFileRequest = new AddFileRequest() {{
+            setName("first.po");
+            setStorageId(1L);
+        }};
+        verify(client).addSource(eq(addFileRequest));
+        verifyNoMoreInteractions(client);
+    }
+
+    @Test
+    public void testUpload_StringBasedProject() throws ResponseException {
+        File fileToUpload = new File(project.getBasePath() + "first.po");
+        project.addFile(Utils.normalizePath("first.po"), "Hello, World!");
+        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
+            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
+            .setBasePath(project.getBasePath());
+        PropertiesWithFiles pb = pbBuilder.build();
+        ProjectClient client = mock(ProjectClient.class);
+        Branch branch = mock(Branch.class);
+        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId())).build();
+        build.setType(Type.STRINGS_BASED);
+        UploadStringsProgress progress = new UploadStringsProgress() {{
+            setIdentifier("id");
+            setProgress(100);
+        }};
+        UploadStringsProgress progressFinished = new UploadStringsProgress() {{
+            setIdentifier("id");
+            setStatus("finished");
+            setProgress(100);
+        }};
+
+        when(branch.getId()).thenReturn(2L);
+        when(client.downloadFullProject()).thenReturn(build);
+        when(client.uploadStorage(eq("first.po"), any())).thenReturn(1L);
+        when(client.addBranch(any())).thenReturn(branch);
+        when(client.addSourceStringsBased(any())).thenReturn(progress);
+        when(client.getUploadStringsStatus(any())).thenReturn(progressFinished);
+
+        NewAction<ProjectProperties, ProjectClient> action = new FileUploadAction(fileToUpload, "branch", false, null, null, false, false, null, false);
+        action.act(Outputter.getDefault(), pb, client);
+
+        verify(client).downloadFullProject();
+        verify(client).uploadStorage(eq("first.po"), any());
+        verify(client).addBranch(any());
+        verify(client).getUploadStringsStatus(any());
+        UploadStringsRequest addFileRequest = new UploadStringsRequest() {{
+            setBranchId(2L);
+            setStorageId(1L);
+            setCleanupMode(false);
+            setUpdateStrings(false);
+        }};
+        verify(client).addSourceStringsBased(eq(addFileRequest));
+        verifyNoMoreInteractions(client);
+    }
+
+    @Test
+    public void testUploadUpdate_FileBasedProject() throws ResponseException {
+        File fileToUpload = new File(project.getBasePath() + "first.po");
+        project.addFile(Utils.normalizePath("first.po"), "Hello, World!");
+        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
+            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
+            .setBasePath(project.getBasePath());
+        PropertiesWithFiles pb = pbBuilder.build();
+        ProjectClient client = mock(ProjectClient.class);
+        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId()))
+            .addFile("first.po", "gettext", 101L, null, null).build();
+        build.setType(Type.FILES_BASED);
+        when(client.downloadFullProject())
+            .thenReturn(build);
+        when(client.uploadStorage(eq("first.po"), any()))
+            .thenReturn(1L);
+
+        NewAction<ProjectProperties, ProjectClient> action = new FileUploadAction(fileToUpload, null, true, null, null, false, false, null, false);
+        action.act(Outputter.getDefault(), pb, client);
+
+        verify(client).downloadFullProject();
+        verify(client).uploadStorage(eq("first.po"), any());
+        UpdateFileRequest addFileRequest = new UpdateFileRequest() {{
+            setStorageId(1L);
+        }};
+        verify(client).updateSource(any(), eq(addFileRequest));
+        verifyNoMoreInteractions(client);
+    }
+
+    @Test
+    public void testUploadNoAutoUpdate_FileBasedProject() throws ResponseException {
+        File fileToUpload = new File(project.getBasePath() + "first.po");
+        project.addFile(Utils.normalizePath("first.po"), "Hello, World!");
+        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
+            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
+            .setBasePath(project.getBasePath());
+        PropertiesWithFiles pb = pbBuilder.build();
+        ProjectClient client = mock(ProjectClient.class);
+        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId()))
+            .addFile("first.po", "gettext", 101L, null, null).build();
+        build.setType(Type.FILES_BASED);
+        when(client.downloadFullProject())
+            .thenReturn(build);
+
+        NewAction<ProjectProperties, ProjectClient> action = new FileUploadAction(fileToUpload, null, false, null, null, false, false, null, false);
+        action.act(Outputter.getDefault(), pb, client);
+
+        verify(client).downloadFullProject();
+        verifyNoMoreInteractions(client);
+    }
+
+    @Test
+    public void testUploadWhenBranchMissed_FileBasedProject() throws ResponseException {
+        File fileToUpload = new File(project.getBasePath() + "first.po");
+        project.addFile(Utils.normalizePath("first.po"), "Hello, World!");
+        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
+            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
+            .setBasePath(project.getBasePath());
+        PropertiesWithFiles pb = pbBuilder.build();
+        ProjectClient client = mock(ProjectClient.class);
+        Branch branch = new Branch() {{
+            setId(3L);
+            setName("main");
+        }};
+        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId())).build();
+        build.setType(Type.FILES_BASED);
+        when(client.downloadFullProject())
+            .thenReturn(build);
+        when(client.uploadStorage(eq("first.po"), any()))
+            .thenReturn(1L);
+        when(client.addBranch(any())).thenReturn(branch);
+
+        NewAction<ProjectProperties, ProjectClient> action = new FileUploadAction(fileToUpload, "main", false, null, null, false, false, null, false);
+        action.act(Outputter.getDefault(), pb, client);
+
+        verify(client).downloadFullProject();
+        verify(client).uploadStorage(eq("first.po"), any());
+        verify(client).addBranch(any());
+        AddFileRequest addFileRequest = new AddFileRequest() {{
+            setName("first.po");
+            setStorageId(1L);
+            setBranchId(3L);
+        }};
+        verify(client).addSource(eq(addFileRequest));
+        verifyNoMoreInteractions(client);
+    }
+
+    @Test
+    public void testUploadLabel_FileBasedProject() throws ResponseException {
+        File fileToUpload = new File(project.getBasePath() + "first.po");
+        project.addFile(Utils.normalizePath("first.po"), "Hello, World!");
+        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
+            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
+            .setBasePath(project.getBasePath());
+        PropertiesWithFiles pb = pbBuilder.build();
+        ProjectClient client = mock(ProjectClient.class);
+        Label label = new Label() {{
+            setId(3L);
+            setTitle("main_label");
+        }};
+        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId())).build();
+        build.setType(Type.FILES_BASED);
+        when(client.downloadFullProject())
+            .thenReturn(build);
+        when(client.uploadStorage(eq("first.po"), any()))
+            .thenReturn(1L);
+        when(client.listLabels()).thenReturn(Collections.emptyList());
+        when(client.addLabel(any())).thenReturn(label);
+
+        NewAction<ProjectProperties, ProjectClient> action = new FileUploadAction(fileToUpload, null, false, Collections.singletonList("main_label"), null, false, false, null, false);
+        action.act(Outputter.getDefault(), pb, client);
+
+        verify(client).downloadFullProject();
+        verify(client).uploadStorage(eq("first.po"), any());
+        verify(client).listLabels();
+        verify(client).addLabel(any());
+        AddFileRequest addFileRequest = new AddFileRequest() {{
+            setName("first.po");
+            setStorageId(1L);
+            setAttachLabelIds(Collections.singletonList(3L));
+        }};
+        verify(client).addSource(eq(addFileRequest));
+        verifyNoMoreInteractions(client);
+    }
+
+    @Test
+    public void testUploadExcludedLangs_FileBasedProject() throws ResponseException {
+        File fileToUpload = new File(project.getBasePath() + "first.po");
+        project.addFile(Utils.normalizePath("first.po"), "Hello, World!");
+        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
+            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
+            .setBasePath(project.getBasePath());
+        PropertiesWithFiles pb = pbBuilder.build();
+        ProjectClient client = mock(ProjectClient.class);
+        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId())).build();
+        build.setType(Type.FILES_BASED);
+        when(client.downloadFullProject())
+            .thenReturn(build);
+        when(client.uploadStorage(eq("first.po"), any()))
+            .thenReturn(1L);
+        when(client.listLabels()).thenReturn(Collections.emptyList());
+
+        NewAction<ProjectProperties, ProjectClient> action = new FileUploadAction(fileToUpload, null, false, null, null, false, false, Arrays.asList("ua", "fr"), false);
+        action.act(Outputter.getDefault(), pb, client);
+
+        verify(client).downloadFullProject();
+        verify(client).uploadStorage(eq("first.po"), any());
+        AddFileRequest addFileRequest = new AddFileRequest() {{
+            setName("first.po");
+            setStorageId(1L);
+            setExcludedTargetLanguages(Collections.singletonList("ua"));
+        }};
+        verify(client).addSource(eq(addFileRequest));
+        verifyNoMoreInteractions(client);
+    }
+
+    @Test
+    public void testUploadWithDest_FileBasedProject() throws ResponseException {
+        File fileToUpload = new File(project.getBasePath() + "first.po");
+        project.addFile(Utils.normalizePath("first.po"), "Hello, World!");
+        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
+            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
+            .setBasePath(project.getBasePath());
+        PropertiesWithFiles pb = pbBuilder.build();
+        ProjectClient client = mock(ProjectClient.class);
+        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId())).build();
+        build.setType(Type.FILES_BASED);
+        Directory directory = new Directory(){{
+            setId(2L);
+        }};
+        when(client.downloadFullProject())
+            .thenReturn(build);
+        when(client.addDirectory(any()))
+            .thenReturn(directory);
+        when(client.uploadStorage(eq("save.po"), any()))
+            .thenReturn(1L);
+        NewAction<ProjectProperties, ProjectClient> action = new FileUploadAction(fileToUpload, null, false, null, "path/to/save.po", false, false, null, false);
+        action.act(Outputter.getDefault(), pb, client);
+
+        verify(client).downloadFullProject();
+        verify(client, times(2)).addDirectory(any());
+        verify(client).uploadStorage(eq("save.po"), any());
+        AddFileRequest addFileRequest = new AddFileRequest() {{
+            setName("save.po");
+            setStorageId(1L);
+            setDirectoryId(2L);
+        }};
+        verify(client).addSource(eq(addFileRequest));
+        verifyNoMoreInteractions(client);
+    }
+
+    @Test
+    public void testUploadCleanUpModeAndUpdateStrings_StringBasedProject() throws ResponseException {
+        File fileToUpload = new File(project.getBasePath() + "first.po");
+        project.addFile(Utils.normalizePath("first.po"), "Hello, World!");
+        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
+            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
+            .setBasePath(project.getBasePath());
+        PropertiesWithFiles pb = pbBuilder.build();
+        ProjectClient client = mock(ProjectClient.class);
+        Branch branch = mock(Branch.class);
+        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId())).build();
+        build.setType(Type.STRINGS_BASED);
+        UploadStringsProgress progress = new UploadStringsProgress() {{
+            setIdentifier("id");
+            setProgress(100);
+        }};
+        UploadStringsProgress progressFinished = new UploadStringsProgress() {{
+            setIdentifier("id");
+            setStatus("finished");
+            setProgress(100);
+        }};
+
+        when(branch.getId()).thenReturn(2L);
+        when(client.downloadFullProject()).thenReturn(build);
+        when(client.uploadStorage(eq("first.po"), any())).thenReturn(1L);
+        when(client.addBranch(any())).thenReturn(branch);
+        when(client.addSourceStringsBased(any())).thenReturn(progress);
+        when(client.getUploadStringsStatus(any())).thenReturn(progressFinished);
+
+        NewAction<ProjectProperties, ProjectClient> action = new FileUploadAction(fileToUpload, "branch", false, null, null, true, true, null, false);
+        action.act(Outputter.getDefault(), pb, client);
+
+        verify(client).downloadFullProject();
+        verify(client).uploadStorage(eq("first.po"), any());
+        verify(client).addBranch(any());
+        verify(client).getUploadStringsStatus(any());
+        UploadStringsRequest addFileRequest = new UploadStringsRequest() {{
+            setBranchId(2L);
+            setStorageId(1L);
+            setCleanupMode(true);
+            setUpdateStrings(true);
+        }};
+        verify(client).addSourceStringsBased(eq(addFileRequest));
+        verifyNoMoreInteractions(client);
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/com/crowdin/cli/commands/actions/FileUploadTranslationActionTest.java b/src/test/java/com/crowdin/cli/commands/actions/FileUploadTranslationActionTest.java
new file mode 100644
index 000000000..085154351
--- /dev/null
+++ b/src/test/java/com/crowdin/cli/commands/actions/FileUploadTranslationActionTest.java
@@ -0,0 +1,101 @@
+package com.crowdin.cli.commands.actions;
+
+import com.crowdin.cli.client.CrowdinProjectFull;
+import com.crowdin.cli.client.ProjectBuilder;
+import com.crowdin.cli.client.ProjectClient;
+import com.crowdin.cli.client.ResponseException;
+import com.crowdin.cli.commands.NewAction;
+import com.crowdin.cli.commands.Outputter;
+import com.crowdin.cli.properties.NewPropertiesWithFilesUtilBuilder;
+import com.crowdin.cli.properties.ProjectProperties;
+import com.crowdin.cli.properties.PropertiesWithFiles;
+import com.crowdin.cli.properties.helper.FileHelperTest;
+import com.crowdin.cli.properties.helper.TempProject;
+import com.crowdin.cli.utils.Utils;
+import com.crowdin.client.projectsgroups.model.Type;
+import com.crowdin.client.sourcefiles.model.Branch;
+import com.crowdin.client.translations.model.UploadTranslationsRequest;
+import com.crowdin.client.translations.model.UploadTranslationsStringsRequest;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.io.File;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.*;
+
+class FileUploadTranslationActionTest {
+    private TempProject project;
+
+    @BeforeEach
+    public void createProj() {
+        project = new TempProject(FileHelperTest.class);
+    }
+
+    @AfterEach
+    public void deleteProj() {
+        project.delete();
+    }
+
+    @Test
+    public void testUploadTranslation_FileBasedProject() throws ResponseException {
+        File fileToUpload = new File(project.getBasePath() + "first_uk.po");
+        project.addFile(Utils.normalizePath("first_uk.po"), "Hello, World!");
+        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
+            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
+            .setBasePath(project.getBasePath());
+        PropertiesWithFiles pb = pbBuilder.build();
+        ProjectClient client = mock(ProjectClient.class);
+        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId()))
+            .addFile("/first.po", "gettext", 101L, null, null, null).build();
+        build.setType(Type.FILES_BASED);
+        when(client.downloadFullProject(any()))
+            .thenReturn(build);
+        when(client.uploadStorage(eq("first_uk.po"), any()))
+            .thenReturn(1L);
+
+        NewAction<ProjectProperties, ProjectClient> action = new FileUploadTranslationAction(fileToUpload, null, "/first.po", "ua", false);
+        action.act(Outputter.getDefault(), pb, client);
+
+        verify(client).downloadFullProject(any());
+        verify(client).uploadStorage(eq("first_uk.po"), any());
+        UploadTranslationsRequest request = new UploadTranslationsRequest() {{
+            setFileId(101L);
+            setStorageId(1L);
+        }};
+        verify(client).uploadTranslations(eq("ua"), eq(request));
+        verifyNoMoreInteractions(client);
+    }
+
+    @Test
+    public void testUploadTranslation_StringBasedProject() throws ResponseException {
+        File fileToUpload = new File(project.getBasePath() + "first_uk.po");
+        project.addFile(Utils.normalizePath("first_uk.po"), "Hello, World!");
+        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
+            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
+            .setBasePath(project.getBasePath());
+        PropertiesWithFiles pb = pbBuilder.build();
+        ProjectClient client = mock(ProjectClient.class);
+        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId()))
+            .addBranches(2L, "main").build();
+        build.setType(Type.STRINGS_BASED);
+        when(client.downloadFullProject(any()))
+            .thenReturn(build);
+        when(client.uploadStorage(eq("first_uk.po"), any()))
+            .thenReturn(1L);
+
+        NewAction<ProjectProperties, ProjectClient> action = new FileUploadTranslationAction(fileToUpload, "main", null, "ua", false);
+        action.act(Outputter.getDefault(), pb, client);
+
+        verify(client).downloadFullProject(any());
+        verify(client).uploadStorage(eq("first_uk.po"), any());
+        UploadTranslationsStringsRequest request = new UploadTranslationsStringsRequest() {{
+            setBranchId(2L);
+            setStorageId(1L);
+        }};
+        verify(client).uploadTranslationStringsBased(eq("ua"), eq(request));
+        verifyNoMoreInteractions(client);
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/com/crowdin/cli/commands/actions/TaskAddActionTest.java b/src/test/java/com/crowdin/cli/commands/actions/TaskAddActionTest.java
index 1aea89bd4..127588b10 100644
--- a/src/test/java/com/crowdin/cli/commands/actions/TaskAddActionTest.java
+++ b/src/test/java/com/crowdin/cli/commands/actions/TaskAddActionTest.java
@@ -14,10 +14,7 @@
 import com.crowdin.cli.utils.Utils;
 import com.crowdin.client.labels.model.Label;
 import com.crowdin.client.sourcestrings.model.AddSourceStringRequest;
-import com.crowdin.client.tasks.model.AddTaskRequest;
-import com.crowdin.client.tasks.model.CrowdinTaskCreateFormRequest;
-import com.crowdin.client.tasks.model.EnterpriseTaskCreateFormRequest;
-import com.crowdin.client.tasks.model.Task;
+import com.crowdin.client.tasks.model.*;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
@@ -57,7 +54,7 @@ public void testTaskAdd(String title, Integer type, String languageId, Map<Strin
         when(projectClient.downloadFullProject(any()))
                 .thenReturn(projectBuilder.build());
 
-        CrowdinTaskCreateFormRequest request = RequestBuilder.addCrowdinTask(title, type, languageId, new ArrayList<>(filesMap.values()),
+        CreateTaskRequest request = RequestBuilder.addCrowdinTask(title, Type.from(String.valueOf(type)), languageId, new ArrayList<>(filesMap.values()),
                 description, skipAssignedStrings, skipUntranslatedStrings, includePreTranslatedStringsOnly, labelIds);
 
         ClientTask client = mock(ClientTask.class);
@@ -109,7 +106,7 @@ public void testEnterpriseTaskAdd(String title, String languageId, Map<String, L
         when(projectClient.downloadFullProject(any()))
                 .thenReturn(projectBuilder.build());
 
-        EnterpriseTaskCreateFormRequest request = RequestBuilder.addEnterpriseTask(title, languageId, new ArrayList<>(filesMap.values()),
+        CreateTaskEnterpriseRequest request = RequestBuilder.addEnterpriseTask(title, languageId, new ArrayList<>(filesMap.values()),
                 description, skipAssignedStrings, false, labelIds, workflowStepId);
 
         ClientTask client = mock(ClientTask.class);
@@ -150,7 +147,7 @@ public void testAddTaskThrows() {
         when(projectClient.downloadFullProject(any()))
                 .thenReturn(projectBuilder.build());
 
-        CrowdinTaskCreateFormRequest request = RequestBuilder.addCrowdinTask(null, null, null,
+        CreateTaskRequest request = RequestBuilder.addCrowdinTask(null, null, null,
                 Arrays.asList(1L), null, false, false, false, null);
 
         when(client.addTask(request))
diff --git a/src/test/java/com/crowdin/cli/commands/picocli/DownloadSubcommandTest.java b/src/test/java/com/crowdin/cli/commands/picocli/DownloadSubcommandTest.java
index 401c123b3..17196b55e 100644
--- a/src/test/java/com/crowdin/cli/commands/picocli/DownloadSubcommandTest.java
+++ b/src/test/java/com/crowdin/cli/commands/picocli/DownloadSubcommandTest.java
@@ -2,17 +2,12 @@
 
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.MethodSource;
 
 import java.util.Arrays;
 import java.util.List;
-import java.util.stream.Stream;
 
 import static com.crowdin.cli.commands.picocli.GenericCommand.RESOURCE_BUNDLE;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.jupiter.params.provider.Arguments.arguments;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.Mockito.verify;
@@ -43,5 +38,4 @@ public void testSubCommandCheckInvalidOptions() {
         List<String> errors = downloadSubcommand.checkOptions();
         assertThat(errors, Matchers.equalTo(Arrays.asList(RESOURCE_BUNDLE.getString("error.download.include_exclude_lang_conflict"))));
     }
-
 }
diff --git a/src/test/java/com/crowdin/cli/commands/picocli/FileDeleteSubcommandTest.java b/src/test/java/com/crowdin/cli/commands/picocli/FileDeleteSubcommandTest.java
new file mode 100644
index 000000000..b9cdca86e
--- /dev/null
+++ b/src/test/java/com/crowdin/cli/commands/picocli/FileDeleteSubcommandTest.java
@@ -0,0 +1,21 @@
+package com.crowdin.cli.commands.picocli;
+
+import org.junit.jupiter.api.Test;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.verify;
+
+class FileDeleteSubcommandTest extends PicocliTestUtils {
+
+    @Test
+    public void testFileDelete() {
+        this.execute(CommandNames.FILE, CommandNames.FILE_DELETE, "file.txt");
+        verify(actionsMock).fileDelete(any(), any());
+        this.check(true);
+    }
+
+    @Test
+    public void testFileDeleteInvalidOptions() {
+        this.executeInvalidParams(CommandNames.FILE, CommandNames.FILE_DELETE);
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/com/crowdin/cli/commands/picocli/FileDownloadSubcommandTest.java b/src/test/java/com/crowdin/cli/commands/picocli/FileDownloadSubcommandTest.java
new file mode 100644
index 000000000..368c11413
--- /dev/null
+++ b/src/test/java/com/crowdin/cli/commands/picocli/FileDownloadSubcommandTest.java
@@ -0,0 +1,28 @@
+package com.crowdin.cli.commands.picocli;
+
+import org.junit.jupiter.api.Test;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.verify;
+
+class FileDownloadSubcommandTest extends PicocliTestUtils {
+
+    @Test
+    public void testFileDownload() {
+        this.execute(CommandNames.FILE, CommandNames.FILE_DOWNLOAD, "file.txt");
+        verify(actionsMock).fileDownload(any(), any(), any());
+        this.check(true);
+    }
+
+    @Test
+    public void testFileDownloadTranslations() {
+        this.execute(CommandNames.FILE, CommandNames.FILE_DOWNLOAD, "file.txt", "--language", "uk");
+        verify(actionsMock).fileDownloadTranslation(any(), any(), any(), any());
+        this.check(true);
+    }
+
+    @Test
+    public void testFileDownloadInvalidOptions() {
+        this.executeInvalidParams(CommandNames.FILE, CommandNames.FILE_DOWNLOAD);
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/com/crowdin/cli/commands/picocli/FileUploadSubcommandTest.java b/src/test/java/com/crowdin/cli/commands/picocli/FileUploadSubcommandTest.java
new file mode 100644
index 000000000..64bfbeebf
--- /dev/null
+++ b/src/test/java/com/crowdin/cli/commands/picocli/FileUploadSubcommandTest.java
@@ -0,0 +1,29 @@
+package com.crowdin.cli.commands.picocli;
+
+import org.junit.jupiter.api.Test;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.Mockito.verify;
+
+class FileUploadSubcommandTest extends PicocliTestUtils {
+
+    @Test
+    public void testFileUpload() {
+        this.execute(CommandNames.FILE, CommandNames.FILE_UPLOAD, "file.txt");
+        verify(actionsMock).fileUpload(any(), any(), anyBoolean(), any(), any(), any(), anyBoolean(), anyBoolean(), anyBoolean());
+        this.check(true);
+    }
+
+    @Test
+    public void testFileUploadTranslations() {
+        this.execute(CommandNames.FILE, CommandNames.FILE_UPLOAD, "file.txt", "--language", "uk");
+        verify(actionsMock).fileUploadTranslation(any(), any(), any(), any(), anyBoolean());
+        this.check(true);
+    }
+
+    @Test
+    public void testFileUploadInvalidOptions() {
+        this.executeInvalidParams(CommandNames.FILE, CommandNames.FILE_UPLOAD);
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/com/crowdin/cli/commands/picocli/PicocliTestUtils.java b/src/test/java/com/crowdin/cli/commands/picocli/PicocliTestUtils.java
index 7ff5b45b2..88238549c 100644
--- a/src/test/java/com/crowdin/cli/commands/picocli/PicocliTestUtils.java
+++ b/src/test/java/com/crowdin/cli/commands/picocli/PicocliTestUtils.java
@@ -120,6 +120,16 @@ void mockActions() {
                 .thenReturn(actionMock);
         when(actionsMock.labelDelete(any()))
                 .thenReturn(actionMock);
+        when(actionsMock.fileUpload(any(), any(), anyBoolean(), any(), any(), any(), anyBoolean(), anyBoolean(), anyBoolean()))
+                .thenReturn(actionMock);
+        when(actionsMock.fileUploadTranslation(any(), any(), any(), any(), anyBoolean()))
+                .thenReturn(actionMock);
+        when(actionsMock.fileDownload(any(), any(), any()))
+                .thenReturn(actionMock);
+        when(actionsMock.fileDownloadTranslation(any(), any(), any(), any()))
+                .thenReturn(actionMock);
+        when(actionsMock.fileDelete(any(), any()))
+                .thenReturn(actionMock);
         when(actionsMock.resolve(any()))
                 .thenReturn(actionMock);
         when(actionsMock.commentList(anyBoolean(), anyBoolean(),any(),any(),any(),any()))
diff --git a/versions.properties b/versions.properties
index c11315083..f036d702f 100644
--- a/versions.properties
+++ b/versions.properties
@@ -45,7 +45,7 @@ version.commons-cli..commons-cli=1.5.0
 
 version.com.h3xstream.findsecbugs..findsecbugs-plugin=1.12.0
 
-version.com.github.crowdin..crowdin-api-client-java=1.11.5
+version.com.github.crowdin..crowdin-api-client-java=1.14.0
 
 plugin.org.asciidoctor.jvm.convert=3.3.2
 
diff --git a/website/mantemplates/crowdin-file-delete.adoc b/website/mantemplates/crowdin-file-delete.adoc
new file mode 100644
index 000000000..599a4fbcd
--- /dev/null
+++ b/website/mantemplates/crowdin-file-delete.adoc
@@ -0,0 +1,16 @@
+:includedir: ../generated-picocli-docs
+:command: crowdin-file-delete
+
+== crowdin file delete
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-description]
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-synopsis]
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-arguments]
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-commands]
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-options]
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-footer]
diff --git a/website/mantemplates/crowdin-file-download.adoc b/website/mantemplates/crowdin-file-download.adoc
new file mode 100644
index 000000000..815d5d842
--- /dev/null
+++ b/website/mantemplates/crowdin-file-download.adoc
@@ -0,0 +1,19 @@
+:includedir: ../generated-picocli-docs
+:command: crowdin-file-download
+
+== crowdin file download
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-description]
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-synopsis]
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-arguments]
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-commands]
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-options]
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-footer]
+
+=== Notes
+This command is experimental. Experimental features are not covered by semver and might change in the future. If you have any feedback, feel free to raise a discussion: https://github.com/crowdin/crowdin-cli/discussions
diff --git a/website/mantemplates/crowdin-file-upload.adoc b/website/mantemplates/crowdin-file-upload.adoc
new file mode 100644
index 000000000..b9a664944
--- /dev/null
+++ b/website/mantemplates/crowdin-file-upload.adoc
@@ -0,0 +1,19 @@
+:includedir: ../generated-picocli-docs
+:command: crowdin-file-upload
+
+== crowdin file upload
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-description]
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-synopsis]
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-arguments]
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-commands]
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-options]
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-footer]
+
+=== Notes
+This command is experimental. Experimental features are not covered by semver and might change in the future. If you have any feedback, feel free to raise a discussion: https://github.com/crowdin/crowdin-cli/discussions
diff --git a/website/mantemplates/crowdin-file.adoc b/website/mantemplates/crowdin-file.adoc
new file mode 100644
index 000000000..32c52ddd5
--- /dev/null
+++ b/website/mantemplates/crowdin-file.adoc
@@ -0,0 +1,16 @@
+:includedir: ../generated-picocli-docs
+:command: crowdin-file
+
+== crowdin file
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-description]
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-synopsis]
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-arguments]
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-commands]
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-options]
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-footer]
diff --git a/website/sidebars.js b/website/sidebars.js
index 4e0ee5dd2..d201c9adc 100644
--- a/website/sidebars.js
+++ b/website/sidebars.js
@@ -55,6 +55,21 @@ const sidebars = {
             'commands/crowdin-download-bundle',
           ]
         },
+        {
+          type: 'category',
+          label: 'crowdin file',
+          link: {
+            type: 'doc',
+            id: 'commands/crowdin-file'
+          },
+          collapsible: true,
+          collapsed: true,
+          items: [
+            'commands/crowdin-file-upload',
+            'commands/crowdin-file-download',
+            'commands/crowdin-file-delete',
+          ]
+        },
         {
           type: 'category',
           label: 'crowdin list',