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