diff --git a/src/main/java/org/wso2/carbon/maven/ApplicationUUFMojo.java b/src/main/java/org/wso2/carbon/maven/ApplicationUUFMojo.java
index 10460db..c4dbf3b 100644
--- a/src/main/java/org/wso2/carbon/maven/ApplicationUUFMojo.java
+++ b/src/main/java/org/wso2/carbon/maven/ApplicationUUFMojo.java
@@ -138,10 +138,11 @@ private Assembly createApplicationAssembly(String assemblyId, String baseDirecto
         try {
             DependencyHolder dependencies = getDependencies(uufTempDirectory);
             for (Path currentTheme : dependencies.getThemes()) {
-                fileSets.add(createFileSet(currentTheme.toString(), "./themes/"));
+                fileSets.add(createFileSet(currentTheme.toString(), "./themes/" + currentTheme.getFileName()));
             }
             for (Path currentComponent : dependencies.getComponents()) {
-                fileSets.add(createFileSet(currentComponent.toString(), "./components/"));
+                fileSets.add(
+                        createFileSet(currentComponent.toString(), "./components/" + currentComponent.getFileName()));
             }
         } catch (IOException e) {
             throw new MojoFailureException(
@@ -152,7 +153,7 @@ private Assembly createApplicationAssembly(String assemblyId, String baseDirecto
         ArrayList<FileItem> fileItems = new ArrayList<>();
         FileItem fileItem = new FileItem();
         fileItem.setSource(uufTempDirectory.resolve(KEY_DEPENDENCY_TREE_FILE).toString());
-        fileItem.setOutputDirectory("/components/");
+        fileItem.setOutputDirectory("./components/");
         fileItems.add(fileItem);
         assembly.setFiles(fileItems);