.../new-code/dev-energymodel-user.c}               | 504 +++++++++++++++++++++
 .../new-code/dev-energymodel-user.h}               | 193 ++++++++
 .../old-code/em-user.c => dev/null}                | 401 ----------------
 .../old-code/em-user.h => dev/null}                | 144 ------
 4 files changed, 697 insertions(+), 545 deletions(-)