It was a real pain for me too. I didn't finish building my crafting stations until after I got the stone that marked where the Queen is. I actually had a chest set up between rooms with all the mats for the workstations so I could tear one down and build the other when I needed it. (The addons were build in the separate rooms or I would have just used 1.)