I find it odd players use a big storage area, I store stuff where they are needed ... craft stuff near the benches, food stuff near the kitchen and junk near the obliterator, some chests for stuff not so easily to catergorise.
So upgrading is relatively easy for me.