Update, my ticket was answered by saying I should pick up all base items and that missing base items should appear back and can be placed. Prior to me doing that when I logged in this morning, the non-amenity and armory base items were back in and placed where they were in my base. I went into decorator mode and the amenities and armory were back in inventory and could be placed. I placed them. I did, however, have to redo one of my armories. All in all not bad - could have been a lot worse.