diff --git a/packages/inventory/src/traits/receptacle.js b/packages/inventory/src/traits/receptacle.js
index e81c606..fd26a59 100644
--- a/packages/inventory/src/traits/receptacle.js
+++ b/packages/inventory/src/traits/receptacle.js
@@ -172,7 +172,7 @@ export default (latus) => class Receptacle extends decorate(Trait) {
     return {
       sounds: () => ({
         yoink: {
-          extends: '/yoink.sound.json',
+          extends: '/item/yoink.sound.json',
         },
       }),
     };
diff --git a/packages/universe/src/server/gen/alpha.js b/packages/universe/src/server/gen/alpha.js
index 3415235..24e7f5c 100644
--- a/packages/universe/src/server/gen/alpha.js
+++ b/packages/universe/src/server/gen/alpha.js
@@ -82,7 +82,7 @@ export default async (room, latus) => {
         v = noise(Vector.scale([x, y], 15), seed + 1);
         if (v < 0.15) {
           // eslint-disable-next-line no-await-in-loop
-          const shrub = await Entity.load({extends: '/shrub.entity.json'});
+          const shrub = await Entity.load({extends: '/ambient/shrub.entity.json'});
           shrub.setPosition(Vector.round(Vector.add(
             Vector.add([8, 8], Vector.scale([x, y], 16)),
             [Math.random() * 8 - 4, Math.random() * 8 - 4],
@@ -91,7 +91,7 @@ export default async (room, latus) => {
         }
         else if (v < 0.17) {
           // eslint-disable-next-line no-await-in-loop
-          const tree = await Entity.load({extends: '/tree.entity.json'});
+          const tree = await Entity.load({extends: '/ambient/tree.entity.json'});
           let p = [x, y];
           p = Vector.sub(p, Vector.mod(p, [2, 2]));
           p = Vector.scale(p, 16);
@@ -104,7 +104,7 @@ export default async (room, latus) => {
         v = noise(Vector.scale([x, y], 9), seed + 1);
         if (v < 0.08) {
           // eslint-disable-next-line no-await-in-loop
-          const flower = await Entity.load({extends: '/flower.entity.json'});
+          const flower = await Entity.load({extends: '/ambient/flower.entity.json'});
           flower.setPosition(Vector.round(Vector.add(
             Vector.add([8, 8], Vector.scale([x, y], 16)),
             [Math.random() * 8 - 4, Math.random() * 8 - 4],