Migrate meters and electricity-raw
More import fixes

To electricity and useres