moved Device.java / EnergySource.java to common
removed Appliance
renamed ApplianceType to DeviceType