diff --git a/cmd/config.go b/cmd/config.go
index 560051cb6..5e5a13727 100644
--- a/cmd/config.go
+++ b/cmd/config.go
@@ -5,12 +5,12 @@ import (
 	"time"
 
 	"github.com/andig/evcc/api"
-	"github.com/andig/evcc/charger"
-	"github.com/andig/evcc/meter"
+	"github.com/andig/evcc/internal/charger"
+	"github.com/andig/evcc/internal/meter"
+	"github.com/andig/evcc/internal/vehicle"
 	"github.com/andig/evcc/provider/mqtt"
 	"github.com/andig/evcc/push"
 	"github.com/andig/evcc/server"
-	"github.com/andig/evcc/vehicle"
 )
 
 type config struct {
diff --git a/detect/keba.go b/detect/keba.go
index df9701d17..d0ed78c6e 100644
--- a/detect/keba.go
+++ b/detect/keba.go
@@ -4,7 +4,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/andig/evcc/charger/keba"
+	"github.com/andig/evcc/internal/charger/keba"
 	"github.com/andig/evcc/util"
 )
 
diff --git a/detect/sma.go b/detect/sma.go
index 0148d95ac..53e0e5611 100644
--- a/detect/sma.go
+++ b/detect/sma.go
@@ -7,7 +7,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/andig/evcc/meter/sma"
+	"github.com/andig/evcc/internal/meter/sma"
 	"github.com/andig/evcc/util"
 )
 
diff --git a/charger/charger.go b/internal/charger/charger.go
similarity index 100%
rename from charger/charger.go
rename to internal/charger/charger.go
diff --git a/charger/config.go b/internal/charger/config.go
similarity index 100%
rename from charger/config.go
rename to internal/charger/config.go
diff --git a/charger/config_test.go b/internal/charger/config_test.go
similarity index 100%
rename from charger/config_test.go
rename to internal/charger/config_test.go
diff --git a/charger/evsewifi.go b/internal/charger/evsewifi.go
similarity index 95%
rename from charger/evsewifi.go
rename to internal/charger/evsewifi.go
index 734312220..2c5a396b1 100644
--- a/charger/evsewifi.go
+++ b/internal/charger/evsewifi.go
@@ -58,7 +58,7 @@ func init() {
 	registry.Add("evsewifi", NewEVSEWifiFromConfig)
 }
 
-//go:generate go run ../cmd/tools/decorate.go -p charger -f decorateEVSE -o evsewifi_decorators -b *EVSEWifi -r api.Charger -t "api.Meter,CurrentPower,func() (float64, error)" -t "api.MeterEnergy,TotalEnergy,func() (float64, error)" -t "api.MeterCurrent,Currents,func() (float64, float64, float64, error)"
+//go:generate go run ../../cmd/tools/decorate.go -p charger -f decorateEVSE -o evsewifi_decorators -b *EVSEWifi -r api.Charger -t "api.Meter,CurrentPower,func() (float64, error)" -t "api.MeterEnergy,TotalEnergy,func() (float64, error)" -t "api.MeterCurrent,Currents,func() (float64, float64, float64, error)"
 
 // NewEVSEWifiFromConfig creates a EVSEWifi charger from generic config
 func NewEVSEWifiFromConfig(other map[string]interface{}) (api.Charger, error) {
diff --git a/charger/evsewifi_decorators.go b/internal/charger/evsewifi_decorators.go
similarity index 100%
rename from charger/evsewifi_decorators.go
rename to internal/charger/evsewifi_decorators.go
diff --git a/charger/evsewifi_test.go b/internal/charger/evsewifi_test.go
similarity index 100%
rename from charger/evsewifi_test.go
rename to internal/charger/evsewifi_test.go
diff --git a/charger/fritzdect.go b/internal/charger/fritzdect.go
similarity index 100%
rename from charger/fritzdect.go
rename to internal/charger/fritzdect.go
diff --git a/charger/go-e.go b/internal/charger/go-e.go
similarity index 100%
rename from charger/go-e.go
rename to internal/charger/go-e.go
diff --git a/charger/go-e_test.go b/internal/charger/go-e_test.go
similarity index 100%
rename from charger/go-e_test.go
rename to internal/charger/go-e_test.go
diff --git a/charger/keba.go b/internal/charger/keba.go
similarity index 99%
rename from charger/keba.go
rename to internal/charger/keba.go
index b63a9d9a7..87563cd4c 100644
--- a/charger/keba.go
+++ b/internal/charger/keba.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/andig/evcc/api"
-	"github.com/andig/evcc/charger/keba"
+	"github.com/andig/evcc/internal/charger/keba"
 	"github.com/andig/evcc/util"
 )
 
diff --git a/charger/keba/listener.go b/internal/charger/keba/listener.go
similarity index 100%
rename from charger/keba/listener.go
rename to internal/charger/keba/listener.go
diff --git a/charger/keba/reports.go b/internal/charger/keba/reports.go
similarity index 100%
rename from charger/keba/reports.go
rename to internal/charger/keba/reports.go
diff --git a/charger/keba/sender.go b/internal/charger/keba/sender.go
similarity index 100%
rename from charger/keba/sender.go
rename to internal/charger/keba/sender.go
diff --git a/charger/keba_test.go b/internal/charger/keba_test.go
similarity index 100%
rename from charger/keba_test.go
rename to internal/charger/keba_test.go
diff --git a/charger/mcc.go b/internal/charger/mcc.go
similarity index 100%
rename from charger/mcc.go
rename to internal/charger/mcc.go
diff --git a/charger/mcc_test.go b/internal/charger/mcc_test.go
similarity index 100%
rename from charger/mcc_test.go
rename to internal/charger/mcc_test.go
diff --git a/charger/nrgble.go b/internal/charger/nrgble.go
similarity index 100%
rename from charger/nrgble.go
rename to internal/charger/nrgble.go
diff --git a/charger/nrgble/nrg_linux.go b/internal/charger/nrgble/nrg_linux.go
similarity index 100%
rename from charger/nrgble/nrg_linux.go
rename to internal/charger/nrgble/nrg_linux.go
diff --git a/charger/nrgble/service.go b/internal/charger/nrgble/service.go
similarity index 100%
rename from charger/nrgble/service.go
rename to internal/charger/nrgble/service.go
diff --git a/charger/nrgble_linux.go b/internal/charger/nrgble_linux.go
similarity index 99%
rename from charger/nrgble_linux.go
rename to internal/charger/nrgble_linux.go
index 648dc252e..7c7e06c69 100644
--- a/charger/nrgble_linux.go
+++ b/internal/charger/nrgble_linux.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/andig/evcc/api"
-	"github.com/andig/evcc/charger/nrgble"
+	"github.com/andig/evcc/internal/charger/nrgble"
 	"github.com/andig/evcc/util"
 	"github.com/godbus/dbus/v5"
 	"github.com/lunixbochs/struc"
diff --git a/charger/nrgble_linux_test.go b/internal/charger/nrgble_linux_test.go
similarity index 100%
rename from charger/nrgble_linux_test.go
rename to internal/charger/nrgble_linux_test.go
diff --git a/charger/nrgconnect.go b/internal/charger/nrgconnect.go
similarity index 100%
rename from charger/nrgconnect.go
rename to internal/charger/nrgconnect.go
diff --git a/charger/nrgconnect_test.go b/internal/charger/nrgconnect_test.go
similarity index 100%
rename from charger/nrgconnect_test.go
rename to internal/charger/nrgconnect_test.go
diff --git a/charger/openwb.go b/internal/charger/openwb.go
similarity index 98%
rename from charger/openwb.go
rename to internal/charger/openwb.go
index a2116fca4..88cc1bed7 100644
--- a/charger/openwb.go
+++ b/internal/charger/openwb.go
@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/andig/evcc/api"
-	"github.com/andig/evcc/charger/openwb"
+	"github.com/andig/evcc/internal/charger/openwb"
 	"github.com/andig/evcc/provider"
 	"github.com/andig/evcc/provider/mqtt"
 	"github.com/andig/evcc/util"
diff --git a/charger/openwb/topics.go b/internal/charger/openwb/topics.go
similarity index 100%
rename from charger/openwb/topics.go
rename to internal/charger/openwb/topics.go
diff --git a/charger/openwb_test.go b/internal/charger/openwb_test.go
similarity index 100%
rename from charger/openwb_test.go
rename to internal/charger/openwb_test.go
diff --git a/charger/phoenix-em-eth.go b/internal/charger/phoenix-em-eth.go
similarity index 92%
rename from charger/phoenix-em-eth.go
rename to internal/charger/phoenix-em-eth.go
index 209d6ae54..9cb6c3af1 100644
--- a/charger/phoenix-em-eth.go
+++ b/internal/charger/phoenix-em-eth.go
@@ -32,7 +32,7 @@ func init() {
 	registry.Add("phoenix-em-eth", NewPhoenixEMEthFromConfig)
 }
 
-//go:generate go run ../cmd/tools/decorate.go -p charger -f decoratePhoenixEMEth -o phoenix-em-eth_decorators -b *PhoenixEMEth -r api.Charger -t "api.Meter,CurrentPower,func() (float64, error)" -t "api.MeterEnergy,TotalEnergy,func() (float64, error)" -t "api.MeterCurrent,Currents,func() (float64, float64, float64, error)"
+//go:generate go run ../../cmd/tools/decorate.go -p charger -f decoratePhoenixEMEth -o phoenix-em-eth_decorators -b *PhoenixEMEth -r api.Charger -t "api.Meter,CurrentPower,func() (float64, error)" -t "api.MeterEnergy,TotalEnergy,func() (float64, error)" -t "api.MeterCurrent,Currents,func() (float64, float64, float64, error)"
 
 // NewPhoenixEMEthFromConfig creates a Phoenix charger from generic config
 func NewPhoenixEMEthFromConfig(other map[string]interface{}) (api.Charger, error) {
@@ -172,7 +172,7 @@ func (wb *PhoenixEMEth) currents() (float64, float64, float64, error) {
 			return 0, 0, 0, err
 		}
 
-		currents = append(currents, rs485.RTUUint32ToFloat64Swapped(b) / 1000)
+		currents = append(currents, rs485.RTUUint32ToFloat64Swapped(b)/1000)
 	}
 
 	return currents[0], currents[1], currents[2], nil
diff --git a/charger/phoenix-em-eth_decorators.go b/internal/charger/phoenix-em-eth_decorators.go
similarity index 100%
rename from charger/phoenix-em-eth_decorators.go
rename to internal/charger/phoenix-em-eth_decorators.go
diff --git a/charger/phoenix-em-eth_test.go b/internal/charger/phoenix-em-eth_test.go
similarity index 100%
rename from charger/phoenix-em-eth_test.go
rename to internal/charger/phoenix-em-eth_test.go
diff --git a/charger/phoenix-ev-eth.go b/internal/charger/phoenix-ev-eth.go
similarity index 92%
rename from charger/phoenix-ev-eth.go
rename to internal/charger/phoenix-ev-eth.go
index c6ee0020e..3d5999b74 100644
--- a/charger/phoenix-ev-eth.go
+++ b/internal/charger/phoenix-ev-eth.go
@@ -26,14 +26,14 @@ var phxEVEthRegCurrents = []uint16{114, 116, 118} // current readings
 // EV-CC-AC1-M3-CBC-RCM-ETH, EV-CC-AC1-M3-CBC-RCM-ETH-3G, EV-CC-AC1-M3-RCM-ETH-XP, EV-CC-AC1-M3-RCM-ETH-3G-XP
 // It uses Modbus TCP to communicate with the controller at modbus client id 255.
 type PhoenixEVEth struct {
-	conn         *modbus.Connection
+	conn *modbus.Connection
 }
 
 func init() {
 	registry.Add("phoenix-ev-eth", NewPhoenixEVEthFromConfig)
 }
 
-//go:generate go run ../cmd/tools/decorate.go -p charger -f decoratePhoenixEVEth -o phoenix-ev-eth_decorators -b *PhoenixEVEth -r api.Charger -t "api.Meter,CurrentPower,func() (float64, error)" -t "api.MeterEnergy,TotalEnergy,func() (float64, error)" -t "api.MeterCurrent,Currents,func() (float64, float64, float64, error)"
+//go:generate go run ../../cmd/tools/decorate.go -p charger -f decoratePhoenixEVEth -o phoenix-ev-eth_decorators -b *PhoenixEVEth -r api.Charger -t "api.Meter,CurrentPower,func() (float64, error)" -t "api.MeterEnergy,TotalEnergy,func() (float64, error)" -t "api.MeterCurrent,Currents,func() (float64, float64, float64, error)"
 
 // NewPhoenixEVEthFromConfig creates a Phoenix charger from generic config
 func NewPhoenixEVEthFromConfig(other map[string]interface{}) (api.Charger, error) {
diff --git a/charger/phoenix-ev-eth_decorators.go b/internal/charger/phoenix-ev-eth_decorators.go
similarity index 100%
rename from charger/phoenix-ev-eth_decorators.go
rename to internal/charger/phoenix-ev-eth_decorators.go
diff --git a/charger/phoenix-ev-eth_test.go b/internal/charger/phoenix-ev-eth_test.go
similarity index 100%
rename from charger/phoenix-ev-eth_test.go
rename to internal/charger/phoenix-ev-eth_test.go
diff --git a/charger/phoenix-ev-ser.go b/internal/charger/phoenix-ev-ser.go
similarity index 100%
rename from charger/phoenix-ev-ser.go
rename to internal/charger/phoenix-ev-ser.go
diff --git a/charger/simpleevse.go b/internal/charger/simpleevse.go
similarity index 100%
rename from charger/simpleevse.go
rename to internal/charger/simpleevse.go
diff --git a/charger/wallbe.go b/internal/charger/wallbe.go
similarity index 100%
rename from charger/wallbe.go
rename to internal/charger/wallbe.go
diff --git a/charger/wallbe_decorators.go b/internal/charger/wallbe_decorators.go
similarity index 100%
rename from charger/wallbe_decorators.go
rename to internal/charger/wallbe_decorators.go
diff --git a/charger/wallbe_test.go b/internal/charger/wallbe_test.go
similarity index 100%
rename from charger/wallbe_test.go
rename to internal/charger/wallbe_test.go
diff --git a/charger/warp.go b/internal/charger/warp.go
similarity index 96%
rename from charger/warp.go
rename to internal/charger/warp.go
index 716795930..762ec5a80 100644
--- a/charger/warp.go
+++ b/internal/charger/warp.go
@@ -64,7 +64,7 @@ type Warp struct {
 	enabled     bool // cache
 }
 
-//go:generate go run ../cmd/tools/decorate.go -p charger -f decorateWarp -o warp_decorators -b *Warp -r api.Charger -t "api.Meter,CurrentPower,func() (float64, error)" -t "api.MeterEnergy,TotalEnergy,func() (float64, error)"
+//go:generate go run ../../cmd/tools/decorate.go -p charger -f decorateWarp -o warp_decorators -b *Warp -r api.Charger -t "api.Meter,CurrentPower,func() (float64, error)" -t "api.MeterEnergy,TotalEnergy,func() (float64, error)"
 
 // NewWarp creates a new configurable charger
 func NewWarp(mqttconf mqtt.Config, topic string, timeout time.Duration) (*Warp, error) {
diff --git a/charger/warp_decorators.go b/internal/charger/warp_decorators.go
similarity index 100%
rename from charger/warp_decorators.go
rename to internal/charger/warp_decorators.go
diff --git a/meter/config.go b/internal/meter/config.go
similarity index 100%
rename from meter/config.go
rename to internal/meter/config.go
diff --git a/meter/config_test.go b/internal/meter/config_test.go
similarity index 100%
rename from meter/config_test.go
rename to internal/meter/config_test.go
diff --git a/meter/discovergy.go b/internal/meter/discovergy.go
similarity index 100%
rename from meter/discovergy.go
rename to internal/meter/discovergy.go
diff --git a/meter/meter.go b/internal/meter/meter.go
similarity index 92%
rename from meter/meter.go
rename to internal/meter/meter.go
index d782c34dd..3735a72e9 100644
--- a/meter/meter.go
+++ b/internal/meter/meter.go
@@ -13,7 +13,7 @@ func init() {
 	registry.Add("default", NewConfigurableFromConfig)
 }
 
-//go:generate go run ../cmd/tools/decorate.go -p meter -f decorateMeter -b api.Meter -o meter_decorators -t "api.MeterEnergy,TotalEnergy,func() (float64, error)" -t "api.MeterCurrent,Currents,func() (float64, float64, float64, error)" -t "api.Battery,SoC,func() (float64, error)"
+//go:generate go run ../../cmd/tools/decorate.go -p meter -f decorateMeter -b api.Meter -o meter_decorators -t "api.MeterEnergy,TotalEnergy,func() (float64, error)" -t "api.MeterCurrent,Currents,func() (float64, float64, float64, error)" -t "api.Battery,SoC,func() (float64, error)"
 
 // NewConfigurableFromConfig creates api.Meter from config
 func NewConfigurableFromConfig(other map[string]interface{}) (api.Meter, error) {
diff --git a/meter/meter_decorators.go b/internal/meter/meter_decorators.go
similarity index 100%
rename from meter/meter_decorators.go
rename to internal/meter/meter_decorators.go
diff --git a/meter/modbus.go b/internal/meter/modbus.go
similarity index 94%
rename from meter/modbus.go
rename to internal/meter/modbus.go
index a08c6be3f..d43f7107c 100644
--- a/meter/modbus.go
+++ b/internal/meter/modbus.go
@@ -27,7 +27,7 @@ func init() {
 	registry.Add("modbus", NewModbusFromConfig)
 }
 
-//go:generate go run ../cmd/tools/decorate.go -p meter -f decorateModbus -b api.Meter -o modbus_decorators -t "api.MeterEnergy,TotalEnergy,func() (float64, error)" -t "api.Battery,SoC,func() (float64, error)"
+//go:generate go run ../../cmd/tools/decorate.go -p meter -f decorateModbus -b api.Meter -o modbus_decorators -t "api.MeterEnergy,TotalEnergy,func() (float64, error)" -t "api.Battery,SoC,func() (float64, error)"
 
 // NewModbusFromConfig creates api.Meter from config
 func NewModbusFromConfig(other map[string]interface{}) (api.Meter, error) {
diff --git a/meter/modbus_decorators.go b/internal/meter/modbus_decorators.go
similarity index 100%
rename from meter/modbus_decorators.go
rename to internal/meter/modbus_decorators.go
diff --git a/meter/openwb.go b/internal/meter/openwb.go
similarity index 98%
rename from meter/openwb.go
rename to internal/meter/openwb.go
index d39ba6073..93db4f057 100644
--- a/meter/openwb.go
+++ b/internal/meter/openwb.go
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/andig/evcc/api"
-	"github.com/andig/evcc/charger/openwb"
+	"github.com/andig/evcc/internal/charger/openwb"
 	"github.com/andig/evcc/provider"
 	"github.com/andig/evcc/provider/mqtt"
 	"github.com/andig/evcc/util"
diff --git a/meter/powerwall/powerwall.go b/internal/meter/powerwall/powerwall.go
similarity index 100%
rename from meter/powerwall/powerwall.go
rename to internal/meter/powerwall/powerwall.go
diff --git a/meter/sma.go b/internal/meter/sma.go
similarity index 95%
rename from meter/sma.go
rename to internal/meter/sma.go
index b6e1db331..f1f793355 100644
--- a/meter/sma.go
+++ b/internal/meter/sma.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/andig/evcc/api"
-	"github.com/andig/evcc/meter/sma"
+	"github.com/andig/evcc/internal/meter/sma"
 	"github.com/andig/evcc/util"
 )
 
@@ -37,7 +37,7 @@ func init() {
 	registry.Add("sma", NewSMAFromConfig)
 }
 
-//go:generate go run ../cmd/tools/decorate.go -p meter -f decorateSMA -b api.Meter -o sma_decorators -t "api.MeterEnergy,TotalEnergy,func() (float64, error)"
+//go:generate go run ../../cmd/tools/decorate.go -p meter -f decorateSMA -b api.Meter -o sma_decorators -t "api.MeterEnergy,TotalEnergy,func() (float64, error)"
 
 // NewSMAFromConfig creates a SMA Meter from generic config
 func NewSMAFromConfig(other map[string]interface{}) (api.Meter, error) {
diff --git a/meter/sma/listener.go b/internal/meter/sma/listener.go
similarity index 100%
rename from meter/sma/listener.go
rename to internal/meter/sma/listener.go
diff --git a/meter/sma/listener_test.go b/internal/meter/sma/listener_test.go
similarity index 100%
rename from meter/sma/listener_test.go
rename to internal/meter/sma/listener_test.go
diff --git a/meter/sma_decorators.go b/internal/meter/sma_decorators.go
similarity index 100%
rename from meter/sma_decorators.go
rename to internal/meter/sma_decorators.go
diff --git a/meter/sma_test.go b/internal/meter/sma_test.go
similarity index 97%
rename from meter/sma_test.go
rename to internal/meter/sma_test.go
index 6b4e295a3..348f7eb03 100644
--- a/meter/sma_test.go
+++ b/internal/meter/sma_test.go
@@ -3,7 +3,7 @@ package meter
 import (
 	"testing"
 
-	"github.com/andig/evcc/meter/sma"
+	"github.com/andig/evcc/internal/meter/sma"
 	"github.com/andig/evcc/util"
 )
 
diff --git a/meter/tesla.go b/internal/meter/tesla.go
similarity index 93%
rename from meter/tesla.go
rename to internal/meter/tesla.go
index 1c97b86f8..fb7bb707f 100644
--- a/meter/tesla.go
+++ b/internal/meter/tesla.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 
 	"github.com/andig/evcc/api"
-	"github.com/andig/evcc/meter/powerwall"
+	"github.com/andig/evcc/internal/meter/powerwall"
 	"github.com/andig/evcc/util"
 	"github.com/andig/evcc/util/request"
 )
@@ -26,7 +26,7 @@ func init() {
 	registry.Add("tesla", NewTeslaFromConfig)
 }
 
-//go:generate go run ../cmd/tools/decorate.go -p meter -f decorateTesla -b api.Meter -o tesla_decorators -t "api.MeterEnergy,TotalEnergy,func() (float64, error)" -t "api.Battery,SoC,func() (float64, error)"
+//go:generate go run ../../cmd/tools/decorate.go -p meter -f decorateTesla -b api.Meter -o tesla_decorators -t "api.MeterEnergy,TotalEnergy,func() (float64, error)" -t "api.Battery,SoC,func() (float64, error)"
 
 // NewTeslaFromConfig creates a Tesla Powerwall Meter from generic config
 func NewTeslaFromConfig(other map[string]interface{}) (api.Meter, error) {
diff --git a/meter/tesla_decorators.go b/internal/meter/tesla_decorators.go
similarity index 100%
rename from meter/tesla_decorators.go
rename to internal/meter/tesla_decorators.go
diff --git a/vehicle/audi.go b/internal/vehicle/audi.go
similarity index 97%
rename from vehicle/audi.go
rename to internal/vehicle/audi.go
index 120c599c1..489a628b9 100644
--- a/vehicle/audi.go
+++ b/internal/vehicle/audi.go
@@ -7,8 +7,8 @@ import (
 	"time"
 
 	"github.com/andig/evcc/api"
+	"github.com/andig/evcc/internal/vehicle/vw"
 	"github.com/andig/evcc/util"
-	"github.com/andig/evcc/vehicle/vw"
 )
 
 // https://github.com/davidgiga1993/AudiAPI
diff --git a/vehicle/bluelink/693a33fa-c117-43f2-ae3b-61a02d24f417 b/internal/vehicle/bluelink/693a33fa-c117-43f2-ae3b-61a02d24f417
similarity index 100%
rename from vehicle/bluelink/693a33fa-c117-43f2-ae3b-61a02d24f417
rename to internal/vehicle/bluelink/693a33fa-c117-43f2-ae3b-61a02d24f417
diff --git a/vehicle/bluelink/99cfff84-f4e2-4be8-a5ed-e5b755eb6581 b/internal/vehicle/bluelink/99cfff84-f4e2-4be8-a5ed-e5b755eb6581
similarity index 100%
rename from vehicle/bluelink/99cfff84-f4e2-4be8-a5ed-e5b755eb6581
rename to internal/vehicle/bluelink/99cfff84-f4e2-4be8-a5ed-e5b755eb6581
diff --git a/vehicle/bluelink/bluelink.go b/internal/vehicle/bluelink/bluelink.go
similarity index 100%
rename from vehicle/bluelink/bluelink.go
rename to internal/vehicle/bluelink/bluelink.go
diff --git a/vehicle/bluelink/stamps.go b/internal/vehicle/bluelink/stamps.go
similarity index 100%
rename from vehicle/bluelink/stamps.go
rename to internal/vehicle/bluelink/stamps.go
diff --git a/vehicle/bmw.go b/internal/vehicle/bmw.go
similarity index 100%
rename from vehicle/bmw.go
rename to internal/vehicle/bmw.go
diff --git a/vehicle/carwings.go b/internal/vehicle/carwings.go
similarity index 100%
rename from vehicle/carwings.go
rename to internal/vehicle/carwings.go
diff --git a/vehicle/config.go b/internal/vehicle/config.go
similarity index 100%
rename from vehicle/config.go
rename to internal/vehicle/config.go
diff --git a/vehicle/config_test.go b/internal/vehicle/config_test.go
similarity index 100%
rename from vehicle/config_test.go
rename to internal/vehicle/config_test.go
diff --git a/vehicle/ford.go b/internal/vehicle/ford.go
similarity index 98%
rename from vehicle/ford.go
rename to internal/vehicle/ford.go
index d6d8424d8..4f90e2b79 100644
--- a/vehicle/ford.go
+++ b/internal/vehicle/ford.go
@@ -8,10 +8,10 @@ import (
 	"time"
 
 	"github.com/andig/evcc/api"
+	"github.com/andig/evcc/internal/vehicle/oidc"
 	"github.com/andig/evcc/provider"
 	"github.com/andig/evcc/util"
 	"github.com/andig/evcc/util/request"
-	"github.com/andig/evcc/vehicle/oidc"
 )
 
 const (
diff --git a/vehicle/helper.go b/internal/vehicle/helper.go
similarity index 100%
rename from vehicle/helper.go
rename to internal/vehicle/helper.go
diff --git a/vehicle/hyundai.go b/internal/vehicle/hyundai.go
similarity index 95%
rename from vehicle/hyundai.go
rename to internal/vehicle/hyundai.go
index 58be94141..6b6732784 100644
--- a/vehicle/hyundai.go
+++ b/internal/vehicle/hyundai.go
@@ -4,8 +4,8 @@ import (
 	"time"
 
 	"github.com/andig/evcc/api"
+	"github.com/andig/evcc/internal/vehicle/bluelink"
 	"github.com/andig/evcc/util"
-	"github.com/andig/evcc/vehicle/bluelink"
 )
 
 // Hyundai is an api.Vehicle implementation
diff --git a/vehicle/id.go b/internal/vehicle/id.go
similarity index 94%
rename from vehicle/id.go
rename to internal/vehicle/id.go
index b630ef8fe..724c88974 100644
--- a/vehicle/id.go
+++ b/internal/vehicle/id.go
@@ -7,9 +7,9 @@ import (
 	"time"
 
 	"github.com/andig/evcc/api"
+	"github.com/andig/evcc/internal/vehicle/id"
+	"github.com/andig/evcc/internal/vehicle/vw"
 	"github.com/andig/evcc/util"
-	"github.com/andig/evcc/vehicle/id"
-	"github.com/andig/evcc/vehicle/vw"
 )
 
 // https://github.com/TA2k/ioBroker.vw-connect
diff --git a/vehicle/id/api.go b/internal/vehicle/id/api.go
similarity index 100%
rename from vehicle/id/api.go
rename to internal/vehicle/id/api.go
diff --git a/vehicle/id/provider.go b/internal/vehicle/id/provider.go
similarity index 100%
rename from vehicle/id/provider.go
rename to internal/vehicle/id/provider.go
diff --git a/vehicle/id/token.go b/internal/vehicle/id/token.go
similarity index 100%
rename from vehicle/id/token.go
rename to internal/vehicle/id/token.go
diff --git a/vehicle/id/token_test.go b/internal/vehicle/id/token_test.go
similarity index 100%
rename from vehicle/id/token_test.go
rename to internal/vehicle/id/token_test.go
diff --git a/vehicle/kamereon/api.go b/internal/vehicle/kamereon/api.go
similarity index 100%
rename from vehicle/kamereon/api.go
rename to internal/vehicle/kamereon/api.go
diff --git a/vehicle/kia.go b/internal/vehicle/kia.go
similarity index 95%
rename from vehicle/kia.go
rename to internal/vehicle/kia.go
index a5390fda5..5584ce9b9 100644
--- a/vehicle/kia.go
+++ b/internal/vehicle/kia.go
@@ -4,8 +4,8 @@ import (
 	"time"
 
 	"github.com/andig/evcc/api"
+	"github.com/andig/evcc/internal/vehicle/bluelink"
 	"github.com/andig/evcc/util"
-	"github.com/andig/evcc/vehicle/bluelink"
 )
 
 // Kia is an api.Vehicle implementation
diff --git a/vehicle/nissan.go b/internal/vehicle/nissan.go
similarity index 98%
rename from vehicle/nissan.go
rename to internal/vehicle/nissan.go
index 32037cc54..c001ac922 100644
--- a/vehicle/nissan.go
+++ b/internal/vehicle/nissan.go
@@ -11,11 +11,11 @@ import (
 	"time"
 
 	"github.com/andig/evcc/api"
+	"github.com/andig/evcc/internal/vehicle/kamereon"
+	"github.com/andig/evcc/internal/vehicle/oidc"
 	"github.com/andig/evcc/provider"
 	"github.com/andig/evcc/util"
 	"github.com/andig/evcc/util/request"
-	"github.com/andig/evcc/vehicle/kamereon"
-	"github.com/andig/evcc/vehicle/oidc"
 )
 
 // Credits to
diff --git a/vehicle/oidc/oidc.go b/internal/vehicle/oidc/oidc.go
similarity index 100%
rename from vehicle/oidc/oidc.go
rename to internal/vehicle/oidc/oidc.go
diff --git a/vehicle/oidc/oidc_test.go b/internal/vehicle/oidc/oidc_test.go
similarity index 100%
rename from vehicle/oidc/oidc_test.go
rename to internal/vehicle/oidc/oidc_test.go
diff --git a/vehicle/porsche.go b/internal/vehicle/porsche.go
similarity index 100%
rename from vehicle/porsche.go
rename to internal/vehicle/porsche.go
diff --git a/vehicle/psa.go b/internal/vehicle/psa.go
similarity index 97%
rename from vehicle/psa.go
rename to internal/vehicle/psa.go
index d46fc4057..4e949a7dc 100644
--- a/vehicle/psa.go
+++ b/internal/vehicle/psa.go
@@ -6,8 +6,8 @@ import (
 	"time"
 
 	"github.com/andig/evcc/api"
+	"github.com/andig/evcc/internal/vehicle/psa"
 	"github.com/andig/evcc/util"
-	"github.com/andig/evcc/vehicle/psa"
 )
 
 // https://github.com/flobz/psa_car_controller
diff --git a/vehicle/psa/api.go b/internal/vehicle/psa/api.go
similarity index 100%
rename from vehicle/psa/api.go
rename to internal/vehicle/psa/api.go
diff --git a/vehicle/psa/duration.go b/internal/vehicle/psa/duration.go
similarity index 100%
rename from vehicle/psa/duration.go
rename to internal/vehicle/psa/duration.go
diff --git a/vehicle/psa/provider.go b/internal/vehicle/psa/provider.go
similarity index 100%
rename from vehicle/psa/provider.go
rename to internal/vehicle/psa/provider.go
diff --git a/vehicle/renault.go b/internal/vehicle/renault.go
similarity index 100%
rename from vehicle/renault.go
rename to internal/vehicle/renault.go
diff --git a/vehicle/seat.go b/internal/vehicle/seat.go
similarity index 97%
rename from vehicle/seat.go
rename to internal/vehicle/seat.go
index 3a9500fc4..ffa1fd5b7 100644
--- a/vehicle/seat.go
+++ b/internal/vehicle/seat.go
@@ -6,8 +6,8 @@ import (
 	"time"
 
 	"github.com/andig/evcc/api"
+	"github.com/andig/evcc/internal/vehicle/vw"
 	"github.com/andig/evcc/util"
-	"github.com/andig/evcc/vehicle/vw"
 )
 
 // https://github.com/trocotronic/weconnect
diff --git a/vehicle/skoda.go b/internal/vehicle/skoda.go
similarity index 97%
rename from vehicle/skoda.go
rename to internal/vehicle/skoda.go
index f0e367743..83b5a7a2b 100644
--- a/vehicle/skoda.go
+++ b/internal/vehicle/skoda.go
@@ -6,8 +6,8 @@ import (
 	"time"
 
 	"github.com/andig/evcc/api"
+	"github.com/andig/evcc/internal/vehicle/vw"
 	"github.com/andig/evcc/util"
-	"github.com/andig/evcc/vehicle/vw"
 )
 
 // https://github.com/trocotronic/weconnect
diff --git a/vehicle/tesla.go b/internal/vehicle/tesla.go
similarity index 100%
rename from vehicle/tesla.go
rename to internal/vehicle/tesla.go
diff --git a/vehicle/vehicle.go b/internal/vehicle/vehicle.go
similarity index 91%
rename from vehicle/vehicle.go
rename to internal/vehicle/vehicle.go
index d32826479..c1f6d411f 100644
--- a/vehicle/vehicle.go
+++ b/internal/vehicle/vehicle.go
@@ -24,7 +24,7 @@ func (m *embed) Capacity() int64 {
 	return m.capacity
 }
 
-//go:generate go run ../cmd/tools/decorate.go -p vehicle -f decorateVehicle -b api.Vehicle -o vehicle_decorators -t "api.ChargeState,Status,func() (api.ChargeStatus, error)" -t "api.VehicleRange,Range,func() (int64, error)"
+//go:generate go run ../../cmd/tools/decorate.go -p vehicle -f decorateVehicle -b api.Vehicle -o vehicle_decorators -t "api.ChargeState,Status,func() (api.ChargeStatus, error)" -t "api.VehicleRange,Range,func() (int64, error)"
 
 // Vehicle is an api.Vehicle implementation with configurable getters and setters.
 type Vehicle struct {
diff --git a/vehicle/vehicle_decorators.go b/internal/vehicle/vehicle_decorators.go
similarity index 100%
rename from vehicle/vehicle_decorators.go
rename to internal/vehicle/vehicle_decorators.go
diff --git a/vehicle/volvo.go b/internal/vehicle/volvo.go
similarity index 100%
rename from vehicle/volvo.go
rename to internal/vehicle/volvo.go
diff --git a/vehicle/vw.go b/internal/vehicle/vw.go
similarity index 97%
rename from vehicle/vw.go
rename to internal/vehicle/vw.go
index 6d62fd72a..8ec0b180b 100644
--- a/vehicle/vw.go
+++ b/internal/vehicle/vw.go
@@ -7,8 +7,8 @@ import (
 	"time"
 
 	"github.com/andig/evcc/api"
+	"github.com/andig/evcc/internal/vehicle/vw"
 	"github.com/andig/evcc/util"
-	"github.com/andig/evcc/vehicle/vw"
 )
 
 // https://github.com/trocotronic/weconnect
diff --git a/vehicle/vw/api.go b/internal/vehicle/vw/api.go
similarity index 100%
rename from vehicle/vw/api.go
rename to internal/vehicle/vw/api.go
diff --git a/vehicle/vw/forms.go b/internal/vehicle/vw/forms.go
similarity index 100%
rename from vehicle/vw/forms.go
rename to internal/vehicle/vw/forms.go
diff --git a/vehicle/vw/functions.go b/internal/vehicle/vw/functions.go
similarity index 100%
rename from vehicle/vw/functions.go
rename to internal/vehicle/vw/functions.go
diff --git a/vehicle/vw/identity.go b/internal/vehicle/vw/identity.go
similarity index 99%
rename from vehicle/vw/identity.go
rename to internal/vehicle/vw/identity.go
index 5154f80c8..2f03eec58 100644
--- a/vehicle/vw/identity.go
+++ b/internal/vehicle/vw/identity.go
@@ -7,9 +7,9 @@ import (
 	"net/url"
 	"strings"
 
+	"github.com/andig/evcc/internal/vehicle/id"
 	"github.com/andig/evcc/util"
 	"github.com/andig/evcc/util/request"
-	"github.com/andig/evcc/vehicle/id"
 	"golang.org/x/net/publicsuffix"
 	"golang.org/x/oauth2"
 )
diff --git a/vehicle/vw/provider.go b/internal/vehicle/vw/provider.go
similarity index 100%
rename from vehicle/vw/provider.go
rename to internal/vehicle/vw/provider.go
diff --git a/vehicle/vw/token.go b/internal/vehicle/vw/token.go
similarity index 97%
rename from vehicle/vw/token.go
rename to internal/vehicle/vw/token.go
index f7b3311a7..b3df85625 100644
--- a/vehicle/vw/token.go
+++ b/internal/vehicle/vw/token.go
@@ -7,9 +7,9 @@ import (
 	"strings"
 	"time"
 
+	"github.com/andig/evcc/internal/vehicle/oidc"
 	"github.com/andig/evcc/util"
 	"github.com/andig/evcc/util/request"
-	"github.com/andig/evcc/vehicle/oidc"
 	"github.com/imdario/mergo"
 	"golang.org/x/oauth2"
 )
diff --git a/vehicle/vw/token_test.go b/internal/vehicle/vw/token_test.go
similarity index 100%
rename from vehicle/vw/token_test.go
rename to internal/vehicle/vw/token_test.go