diff --git a/v2/pkg/commands/build/internal/backendjs/packages.go b/v2/pkg/commands/build/internal/backendjs/packages.go
index 8f45376e2..f627928cf 100644
--- a/v2/pkg/commands/build/internal/backendjs/packages.go
+++ b/v2/pkg/commands/build/internal/backendjs/packages.go
@@ -3,7 +3,6 @@ package backendjs
 import (
 	"bytes"
 	"io/ioutil"
-	"path/filepath"
 	"reflect"
 	"text/template"
 
@@ -25,7 +24,7 @@ func generatePackages() error {
 		return errors.Wrap(err, "Error parsing struct packages:")
 	}
 
-	err = generateJSFiles(packages)
+	err = generatePackageFiles(packages)
 	if err != nil {
 		return errors.Wrap(err, "Error generating struct js file:")
 	}
@@ -100,54 +99,6 @@ func parsePackages() ([]*Package, error) {
 	return result, nil
 }
 
-func generateJSFiles(packages []*Package) error {
-
-	err := generateIndexJS(packages)
-	if err != nil {
-		return errors.Wrap(err, "Error generating index.js file")
-	}
-
-	err = generatePackageFiles(packages)
-	if err != nil {
-		return errors.Wrap(err, "Error generating packages")
-	}
-
-	return nil
-}
-
-func generateIndexJS(packages []*Package) error {
-
-	// Get path to local file
-	templateFile := fs.RelativePath("./index.template")
-
-	// Load template
-	javascriptTemplateData := fs.MustLoadString(templateFile)
-	packagesTemplate, err := template.New("index").Parse(javascriptTemplateData)
-	if err != nil {
-		return errors.Wrap(err, "Error creating template")
-	}
-
-	// Execute template
-	var buffer bytes.Buffer
-	err = packagesTemplate.Execute(&buffer, packages)
-	if err != nil {
-		return errors.Wrap(err, "Error generating code")
-	}
-
-	// Calculate target filename
-	indexJS, err := fs.RelativeToCwd("./frontend/backend/index.js")
-	if err != nil {
-		return errors.Wrap(err, "Error calculating index js path")
-	}
-
-	err = ioutil.WriteFile(indexJS, buffer.Bytes(), 0755)
-	if err != nil {
-		return errors.Wrap(err, "Error writing backend package index.js file")
-	}
-
-	return nil
-}
-
 func generatePackageFiles(packages []*Package) error {
 
 	// Get path to local file
@@ -174,14 +125,11 @@ func generatePackageFiles(packages []*Package) error {
 	for _, thisPackage := range packages {
 
 		// Calculate target directory
-		packageDir, err := fs.RelativeToCwd("./frontend/backend/" + thisPackage.Name)
+		packageFile, err := fs.RelativeToCwd("./frontend/backend/" + thisPackage.Name)
 		if err != nil {
 			return errors.Wrap(err, "Error calculating package path")
 		}
 
-		// Make the dir but ignore if it already exists
-		fs.Mkdir(packageDir)
-
 		// Execute javascript template
 		var buffer bytes.Buffer
 		err = javascriptTemplate.Execute(&buffer, thisPackage)
@@ -190,7 +138,7 @@ func generatePackageFiles(packages []*Package) error {
 		}
 
 		// Save javascript file
-		err = ioutil.WriteFile(filepath.Join(packageDir, "index.js"), buffer.Bytes(), 0755)
+		err = ioutil.WriteFile(packageFile+".js", buffer.Bytes(), 0755)
 		if err != nil {
 			return errors.Wrap(err, "Error writing backend package file")
 		}
@@ -205,7 +153,7 @@ func generatePackageFiles(packages []*Package) error {
 		}
 
 		// Save typescript file
-		err = ioutil.WriteFile(filepath.Join(packageDir, "index.d.ts"), buffer.Bytes(), 0755)
+		err = ioutil.WriteFile(packageFile+".d.ts", buffer.Bytes(), 0755)
 		if err != nil {
 			return errors.Wrap(err, "Error writing backend package file")
 		}