Yet another reorg of the package and class structure.
First impl of JPAWattDepository.
Updating the datamodel.