Add shop modules to this suggestion, at least with storage all items get dumped into space, pick up a shop module and all shop inventory just plain disappears, no mad scramble to collect the stuff and put it into a freshly placed storage module, it's just gone!