diff --git a/action1.yaml b/docker/action1.yaml
similarity index 100%
rename from action1.yaml
rename to docker/action1.yaml
diff --git a/compose.yaml b/docker/compose.yaml
similarity index 100%
rename from compose.yaml
rename to docker/compose.yaml
diff --git a/src/main/java/group/goforward/battlbuilder/controllers/AuthController.java b/src/main/java/group/goforward/battlbuilder/controllers/AuthController.java
index e5a8a59..7a6984f 100644
--- a/src/main/java/group/goforward/battlbuilder/controllers/AuthController.java
+++ b/src/main/java/group/goforward/battlbuilder/controllers/AuthController.java
@@ -19,7 +19,7 @@ import java.util.Map;
 import java.util.UUID;
 
 @RestController
-@RequestMapping("/api/auth")
+@RequestMapping({"/api/auth", "/api/v1/auth"})
 @CrossOrigin
 public class AuthController {
 
diff --git a/src/main/java/group/goforward/battlbuilder/controllers/BuilderBootstrapController.java b/src/main/java/group/goforward/battlbuilder/controllers/BuilderBootstrapController.java
index 2071d1c..9203574 100644
--- a/src/main/java/group/goforward/battlbuilder/controllers/BuilderBootstrapController.java
+++ b/src/main/java/group/goforward/battlbuilder/controllers/BuilderBootstrapController.java
@@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.*;
 
 @RestController
-@RequestMapping("/api/builder")
+@RequestMapping({"/api/builder", "/api/v1/builder"})
 @CrossOrigin
 public class BuilderBootstrapController {
 
diff --git a/src/main/java/group/goforward/battlbuilder/controllers/CategoryController.java b/src/main/java/group/goforward/battlbuilder/controllers/CategoryController.java
index 9faf1d8..00c3de7 100644
--- a/src/main/java/group/goforward/battlbuilder/controllers/CategoryController.java
+++ b/src/main/java/group/goforward/battlbuilder/controllers/CategoryController.java
@@ -7,7 +7,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.List;
 
 @RestController
-@RequestMapping("/api/categories")
+@RequestMapping({"/api/categories", "/api/v1/categories"})
 @CrossOrigin // you can tighten origins later
 public class CategoryController {
 
diff --git a/src/main/java/group/goforward/battlbuilder/controllers/ImportController.java b/src/main/java/group/goforward/battlbuilder/controllers/ImportController.java
index 1ecfe76..8dc878e 100644
--- a/src/main/java/group/goforward/battlbuilder/controllers/ImportController.java
+++ b/src/main/java/group/goforward/battlbuilder/controllers/ImportController.java
@@ -5,7 +5,8 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
-@RequestMapping("/api/admin/imports")
+@RequestMapping({"/api/admin/imports", "/api/v1/admin/imports"})
+
 @CrossOrigin(origins = "http://localhost:3000")
 public class ImportController {
 
diff --git a/src/main/java/group/goforward/battlbuilder/controllers/MerchantDebugController.java b/src/main/java/group/goforward/battlbuilder/controllers/MerchantDebugController.java
index 9077709..9461e48 100644
--- a/src/main/java/group/goforward/battlbuilder/controllers/MerchantDebugController.java
+++ b/src/main/java/group/goforward/battlbuilder/controllers/MerchantDebugController.java
@@ -3,11 +3,13 @@ package group.goforward.battlbuilder.controllers;
 import group.goforward.battlbuilder.model.Merchant;
 import group.goforward.battlbuilder.repos.MerchantRepository;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
 @RestController
+@RequestMapping({"/api/admin", "/api/v1/admin"})
 public class MerchantDebugController {
 
     private final MerchantRepository merchantRepository;
@@ -16,7 +18,7 @@ public class MerchantDebugController {
         this.merchantRepository = merchantRepository;
     }
 
-    @GetMapping("/api/admin/debug/merchants")
+    @GetMapping("/debug/merchants")
     public List<Merchant> listMerchants() {
         return merchantRepository.findAll();
     }
diff --git a/src/main/java/group/goforward/battlbuilder/controllers/PartRoleMappingController.java b/src/main/java/group/goforward/battlbuilder/controllers/PartRoleMappingController.java
index 9630dd2..ad421ef 100644
--- a/src/main/java/group/goforward/battlbuilder/controllers/PartRoleMappingController.java
+++ b/src/main/java/group/goforward/battlbuilder/controllers/PartRoleMappingController.java
@@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.List;
 
 @RestController
-@RequestMapping("/api/part-role-mappings")
+@RequestMapping({"/api/part-role-mappings", "/api/v1/part-role-mappings"})
 public class PartRoleMappingController {
 
     private final PartRoleMappingService service;
diff --git a/src/main/java/group/goforward/battlbuilder/controllers/ProductController.java b/src/main/java/group/goforward/battlbuilder/controllers/ProductController.java
index 0ec8825..de83357 100644
--- a/src/main/java/group/goforward/battlbuilder/controllers/ProductController.java
+++ b/src/main/java/group/goforward/battlbuilder/controllers/ProductController.java
@@ -24,7 +24,7 @@ import java.util.List;
  */
 @Deprecated
 @RestController
-@RequestMapping("/api/products")
+@RequestMapping({"/api/products", "/api/v1/products"})
 @CrossOrigin
 @ConditionalOnProperty(name = "app.api.legacy.enabled", havingValue = "true", matchIfMissing = false)
 public class ProductController {
diff --git a/src/main/java/group/goforward/battlbuilder/controllers/api/BrandController.java b/src/main/java/group/goforward/battlbuilder/controllers/api/BrandController.java
index edcceee..f5ec691 100644
--- a/src/main/java/group/goforward/battlbuilder/controllers/api/BrandController.java
+++ b/src/main/java/group/goforward/battlbuilder/controllers/api/BrandController.java
@@ -12,7 +12,7 @@ import java.util.List;
 
 
 @RestController
-@RequestMapping("/api/brands")
+@RequestMapping({"/api/v1/brands", "/api/brands"})
 public class BrandController {
     @Autowired
     private BrandRepository repo;
diff --git a/src/main/java/group/goforward/battlbuilder/controllers/api/BuildController.java b/src/main/java/group/goforward/battlbuilder/controllers/api/BuildController.java
new file mode 100644
index 0000000..11b3f0b
--- /dev/null
+++ b/src/main/java/group/goforward/battlbuilder/controllers/api/BuildController.java
@@ -0,0 +1,34 @@
+package group.goforward.battlbuilder.controllers.api;
+
+import group.goforward.battlbuilder.model.Build;
+import group.goforward.battlbuilder.repos.BuildRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+
+@RestController
+@RequestMapping("/v1/api/builds")
+public class BuildController {
+    @Autowired
+    private BuildRepository repo;
+    @Autowired
+            //  private BuildsService service;
+//@Cacheable(value="getAllStates")
+    @GetMapping("/all")
+    public ResponseEntity<List<Build>> getAll() {
+        List<Build> builds = repo.findAll();
+        return ResponseEntity.ok(builds);
+    }
+
+    @GetMapping("/{id}")
+    public ResponseEntity<Build> getAllBuildsById(@PathVariable Integer id) {
+        return repo.findById(id)
+                .map(ResponseEntity::ok)
+                .orElse(ResponseEntity.notFound().build());
+    }
+
+
+}
diff --git a/src/main/java/group/goforward/battlbuilder/controllers/api/ImagesController.java b/src/main/java/group/goforward/battlbuilder/controllers/api/ImageController.java
similarity index 93%
rename from src/main/java/group/goforward/battlbuilder/controllers/api/ImagesController.java
rename to src/main/java/group/goforward/battlbuilder/controllers/api/ImageController.java
index 976fa4c..9db5bfd 100644
--- a/src/main/java/group/goforward/battlbuilder/controllers/api/ImagesController.java
+++ b/src/main/java/group/goforward/battlbuilder/controllers/api/ImageController.java
@@ -15,11 +15,11 @@ import java.time.Duration;
 
 @RestController
 @RequestMapping("/api/images")
-public class ImagesController {
+public class ImageController {
 
     private final ImageService imageService;
 
-    public ImagesController(ImageService imageService) {
+    public ImageController(ImageService imageService) {
         this.imageService = imageService;
     }
 
diff --git a/src/main/java/group/goforward/battlbuilder/controllers/api/MeController.java b/src/main/java/group/goforward/battlbuilder/controllers/api/MeController.java
index bc1f8dc..7f5d52c 100644
--- a/src/main/java/group/goforward/battlbuilder/controllers/api/MeController.java
+++ b/src/main/java/group/goforward/battlbuilder/controllers/api/MeController.java
@@ -18,7 +18,7 @@ import java.util.UUID;
 import static org.springframework.http.HttpStatus.*;
 
 @RestController
-@RequestMapping("/api/users/me")
+@RequestMapping({"/api/v1/users/me", "/api/users/me"})
 @CrossOrigin
 public class MeController {
 
diff --git a/src/main/java/group/goforward/battlbuilder/controllers/api/StateController.java b/src/main/java/group/goforward/battlbuilder/controllers/api/StateController.java
index fc9f4b5..3d8a6ef 100644
--- a/src/main/java/group/goforward/battlbuilder/controllers/api/StateController.java
+++ b/src/main/java/group/goforward/battlbuilder/controllers/api/StateController.java
@@ -12,7 +12,7 @@ import java.util.List;
 
 
 @RestController
-@RequestMapping("/api/states")
+@RequestMapping({"/api/states", "/api/v1/states"})
 public class StateController {
     @Autowired
     private StateRepository repo;
diff --git a/src/main/java/group/goforward/battlbuilder/controllers/api/UserController.java b/src/main/java/group/goforward/battlbuilder/controllers/api/UserController.java
index 9a5f88a..6088209 100644
--- a/src/main/java/group/goforward/battlbuilder/controllers/api/UserController.java
+++ b/src/main/java/group/goforward/battlbuilder/controllers/api/UserController.java
@@ -11,7 +11,7 @@ import java.util.List;
 
 
 @RestController
-@RequestMapping("/api/user")
+@RequestMapping({"/api/user", "/api/v1/user"})
 public class UserController {
     private final UserRepository repo;
     private final UsersService usersService;
diff --git a/src/main/java/group/goforward/battlbuilder/services/BuildsService.java b/src/main/java/group/goforward/battlbuilder/services/BuildsService.java
new file mode 100644
index 0000000..47e9b2d
--- /dev/null
+++ b/src/main/java/group/goforward/battlbuilder/services/BuildsService.java
@@ -0,0 +1,12 @@
+package group.goforward.battlbuilder.services;
+
+import aj.org.objectweb.asm.commons.Remapper;
+import group.goforward.battlbuilder.model.Brand;
+
+public interface BuildsService {
+    Brand save(Brand item);
+
+    Remapper findById(Integer id);
+
+    void deleteById(Integer id);
+}