Added energyMeasuremetn variables to building and floor + clean up of
imports.