How to structure a modell / data / input

Hi,

I'm about to start structuring a new model in Excel.

And I will have several layers of data.

Year: 2004 & 2007
Type: New Build & Refurbishment
Size: 1'000 sq.m & 10'000 sq.m

Which gives me basically 8 data table ( 2 * 2 * 2 )

At the moment I have structured it into 8 different tables. See the attachment.

Is this is most logical way to handle this data? I feel that it very quickly gets difficult to distinguish between what table represent data for what....