TestWattDepotClient passes, need a few more tests for measurements.
package reorganization.
Working on the restlet based collectors.