2 Corinthians 5:1-4 NASB

I would like to say I fully understand this passage, but I find myself pondering as to whether Paul is using the terms house, tent and clothes as an analogy to our bodies, or if he is being literal. My guess is that these are metaphors for our physical and spiritual bodies. The physical bodies that we inherited when born into this world, that is marred by sin and causes us all kind of woes (thus making our spirit inside grumble and groan), stands in contrast to the heavenly body that we inherit once we die and go to heaven. And yet with salvation through Christ, while our bodies are still decaying and dying, our spirit is becoming transformed in preparation for its "heavenly dwelling", which is why it often longs for this.
God please continue in me the transformative work you have begun, renew my spirit everyday, so that one day I may be complete in my heavenly dwelling.