diff --git a/packages/ext-movetolatest/upgradeTemplates/extjs/build.xml b/packages/ext-movetolatest/upgradeTemplates/extjs/build.xml
index 85c2c82..d1934bb 100644
--- a/packages/ext-movetolatest/upgradeTemplates/extjs/build.xml
+++ b/packages/ext-movetolatest/upgradeTemplates/extjs/build.xml
@@ -1,83 +1,80 @@
 <?xml version="1.0" encoding="utf-8"?>
 <project name="appModern" default=".help">
 
-    <!-- Find and load Sencha Cmd ant tasks -->
+<fileset dir="./" id="regexp.bundle">
+    <filename regex="^main.*([A-Z0-9.])w*(w.)?js" />
+    <exclude name="node_modules/" />
+    <exclude name="app/" />
+    <exclude name="build/" />
+    <exclude name=".sencha/" />
+    <exclude name="packages/" />
+    <exclude name="generatedFiles/" />
+    <exclude name="resources/" />
+  </fileset>
+
     <script language="javascript">
-        <![CDATA[
-            var dir = project.getProperty("basedir"),
-                cmdDir = project.getProperty("cmd.dir"),
-                cmdLoaded = project.getReference("senchaloader");
-            if (!cmdLoaded) {
-                function echo(message, file) {
-                    var e = project.createTask("echo");
-                    e.setMessage(message);
-                    if (file) {
-                        e.setFile(file);
-                    }
-                    e.execute();
-                };
-                if (!cmdDir) {
-                    function exec(args) {
-                        var process = java.lang.Runtime.getRuntime().exec(args),
-                            input = new java.io.BufferedReader(new java.io.InputStreamReader(process.getInputStream())),
-                            headerFound = false,
-                            line;
-                        while (line = input.readLine()) {
-                            line = line + '';
-                            java.lang.System.out.println(line);
-                            if (line.indexOf("Sencha Cmd") > -1) {
-                                headerFound = true;
-                            }
-                            else if (headerFound && !cmdDir) {
-                                cmdDir = line;
-                                project.setProperty("cmd.dir", cmdDir);
-                            }
-                        }
-                        process.waitFor();
-                        return !!cmdDir;
-                    }
-                    if (!exec(["sencha", "which"])) {
-                        var tmpFile = "tmp.sh";
-                        echo("source ~/.bash_profile; sencha " + whichArgs.join(" "), tmpFile);
-                        exec(["/bin/sh", tmpFile]);
-                        new java.io.File(tmpFile)['delete'](); 
-                    }
-                }
-            }
-            if (cmdDir && !project.getTargets().containsKey("init-cmd")) {
-                var importDir = project.getProperty("build-impl.dir") || 
-                                (cmdDir + "/ant/build/app/build-impl.xml");
-                var importTask = project.createTask("import");
-                importTask.setOwningTarget(self.getOwningTarget());
-                importTask.setLocation(self.getLocation());
-                importTask.setFile(importDir);
-                importTask.execute();
-            }
-        ]]>
-    </script>
+<![CDATA[
+  var dir = project.getProperty("basedir"),
+      cmdDir = project.getProperty("cmd.dir"),
+      cmdLoaded = project.getReference("senchaloader");
+  if (!cmdLoaded) {
+    function echo(message, file) {
+      var e = project.createTask("echo");
+      e.setMessage(message);
+      if (file) {
+        e.setFile(file);
+      }
+      e.execute();
+    };
+    if (!cmdDir) {
+      function exec(args) {
+        var process = java.lang.Runtime.getRuntime().exec(args),
+            input = new java.io.BufferedReader(new java.io.InputStreamReader(process.getInputStream())),
+            headerFound = false,
+            line;
+        while (line = input.readLine()) {
+          line = line + '';
+          java.lang.System.out.println(line);
+          if (line.indexOf("Sencha Cmd") > -1) {
+            headerFound = true;
+          }
+          else if (headerFound && !cmdDir) {
+            cmdDir = line;
+            project.setProperty("cmd.dir", cmdDir);
+          }
+        }
+        process.waitFor();
+        return !!cmdDir;
+      }
+      if (!exec(["sencha", "which"])) {
+        var tmpFile = "tmp.sh";
+        echo("source ~/.bash_profile; sencha " + whichArgs.join(" "), tmpFile);
+        exec(["/bin/sh", tmpFile]);
+        new java.io.File(tmpFile)['delete'](); 
+      }
+    }
+  }
+  if (cmdDir && !project.getTargets().containsKey("init-cmd")) {
+    var importDir = project.getProperty("build-impl.dir") || 
+                    (cmdDir + "/ant/build/app/build-impl.xml");
+    var importTask = project.createTask("import");
+    importTask.setOwningTarget(self.getOwningTarget());
+    importTask.setLocation(self.getLocation());
+    importTask.setFile(importDir);
+    importTask.execute();
+  }
+]]>
+  </script>
+
+  <target name="-before-build">
+    <pathconvert pathsep="$&#123;line.separator&#125;" property="app.webpack.bundle.file" refid="regexp.bundle" />
+    <basename property="app.webpack.bundle" file="$&#123;app.webpack.bundle.file&#125;"/>
+  </target>
+
+  <target name="-after-build">
+    <delete failonerror="true" includeemptydirs="false" verbose="true">
+      <fileset refid="regexp.bundle" />
+    </delete>
+  </target>
 
-    <!--
-    The following targets can be provided to inject logic before and/or after key steps
-    of the build process:
-        The "init-local" target is used to initialize properties that may be personalized
-        for the local machine.
-            <target name="-before-init-local"/>
-            <target name="-after-init-local"/>
-        The "clean" target is used to clean build output from the build.dir.
-            <target name="-before-clean"/>
-            <target name="-after-clean"/>
-        The general "init" target is used to initialize all other properties, including
-        those provided by Sencha Cmd.
-            <target name="-before-init"/>
-            <target name="-after-init"/>
-        The "page" target performs the call to Sencha Cmd to build the 'all-classes.js' file.
-            <target name="-before-page"/>
-            <target name="-after-page"/>
-        The "build" target performs the call to Sencha Cmd to build the application.
-            <target name="-before-build"/>
-            <target name="-after-build"/>
-    -->
-    <target name="-before-build">
-      <echo file="temp.txt" append="true" message="$&#123;app.output.base&#125;"/>
-    </target>
-</project>
\ No newline at end of file
+</project>