At first read, this Psalm seems like it might have originally been two different subjects combined to make one Psalm. But on further investigation it is much more likely that the Psalmist knew exactly what he was doing in writing this beautiful piece about one "house" and Who it is really all about.