restructure ev, ev template and charge template

packages/control/algorithm/additional_current_test.py

@@ -5,7 +5,8 @@
 from control.chargepoint.chargepoint import Chargepoint, ChargepointData
 from control.chargepoint.chargepoint_data import Set
 from control.chargepoint.control_parameter import ControlParameter
-from control.ev import ChargeTemplate, Ev
+from control.ev.charge_template import ChargeTemplate
+from control.ev.ev import Ev
 from control.loadmanagement import LimitingValue
 
 

packages/control/algorithm/common_test.py

@@ -6,7 +6,7 @@
 from control import data
 from control.algorithm import common
 from control.chargepoint.chargepoint import Chargepoint
-from control.ev import Ev
+from control.ev.ev import Ev
 from control.counter import Counter
 from control.counter_all import CounterAll
 

packages/control/algorithm/filter_chargepoints_test.py

@@ -9,8 +9,9 @@
 from control.chargemode import Chargemode
 from control.chargepoint.chargepoint import Chargepoint, ChargepointData
 from control.chargepoint.chargepoint_data import Log, Set
+from control.chargepoint.control_parameter import ControlParameter
 from control.counter_all import CounterAll
-from control.ev import ControlParameter, Ev, EvData, Get
+from control.ev.ev import Ev, EvData, Get
 
 
 @dataclass

packages/control/algorithm/integration_test/conftest.py

@@ -9,7 +9,7 @@
 from control.chargepoint.chargepoint import Chargepoint
 from control.counter_all import CounterAll
 from control.counter import Counter
-from control.ev import Ev
+from control.ev.ev import Ev
 from control.pv import Pv
 from control.chargepoint.chargepoint_state import ChargepointState
 from test_utils.default_hierarchies import NESTED_HIERARCHY

packages/control/algorithm/surplus_controlled_test.py

@@ -11,7 +11,8 @@
 from control.chargepoint.chargepoint_data import Get, Set
 from control.chargepoint.chargepoint_template import CpTemplate
 from control.chargepoint.control_parameter import ControlParameter
-from control.ev import ChargeTemplate, Ev
+from control.ev.charge_template import ChargeTemplate
+from control.ev.ev import Ev
 
 
 @pytest.fixture(autouse=True)

packages/control/auto_phase_switch_test.py

@@ -8,7 +8,7 @@
 from control.pv_all import PvAll
 from control.bat_all import BatAll
 from control.general import General
-from control.ev import Ev
+from control.ev.ev import Ev
 from control import data
 from control.chargepoint.chargepoint_state import ChargepointState
 

packages/control/chargepoint/chargepoint.py

@@ -29,7 +29,7 @@
 from control.chargepoint.control_parameter import ControlParameter, control_parameter_factory
 from control.chargepoint.charging_type import ChargingType
 from control.chargepoint.rfid import ChargepointRfidMixin
-from control.ev import Ev
+from control.ev.ev import Ev
 from control import phase_switch
 from control.chargepoint.chargepoint_state import ChargepointState
 from helpermodules.phase_mapping import convert_single_evu_phase_to_cp_phase

packages/control/chargepoint/chargepoint_data.py

@@ -4,7 +4,7 @@
 from control.chargepoint.chargepoint_template import CpTemplate
 
 from control.chargepoint.control_parameter import ControlParameter, control_parameter_factory
-from control.ev import Ev
+from control.ev.ev import Ev
 from dataclass_utils.factories import currents_list_factory, empty_dict_factory, voltages_list_factory
 from helpermodules.constants import NO_ERROR
 from modules.common.abstract_chargepoint import AbstractChargepoint

packages/control/chargepoint/chargepoint_template.py

@@ -4,7 +4,7 @@
 from typing import Dict, List
 
 from control import data
-from control import ev as ev_module
+from control.ev import ev as ev_module
 from control.chargepoint.charging_type import ChargingType
 from dataclass_utils.factories import empty_dict_factory, empty_list_factory
 from helpermodules.abstract_plans import AutolockPlan

packages/control/chargepoint/chargepoint_test.py

@@ -4,7 +4,7 @@
 
 from control.chargepoint.chargepoint import Chargepoint
 from control.chargepoint.chargepoint_template import CpTemplate
-from control.ev import Ev
+from control.ev.ev import Ev
 
 
 @pytest.mark.parametrize("phase_1, phases, expected_required_currents",

packages/control/chargepoint/get_phases_test.py

@@ -5,7 +5,7 @@
 
 from control.chargepoint.chargepoint import Chargepoint
 from control.chargepoint.chargepoint_template import CpTemplate, get_chargepoint_template_default
-from control.ev import Ev
+from control.ev.ev import Ev
 from control.general import General
 from control import data
 

packages/control/counter.py

@@ -8,7 +8,7 @@
 
 from control import data
 from control.chargemode import Chargemode
-from control.ev import Ev
+from control.ev.ev import Ev
 from control.chargepoint.chargepoint import Chargepoint
 from control.chargepoint.chargepoint_state import ChargepointState
 from dataclass_utils.factories import currents_list_factory, voltages_list_factory

packages/control/counter_test.py

@@ -7,7 +7,8 @@
 from control import data
 from control.chargepoint.chargepoint import Chargepoint
 from control.counter import Counter, CounterData, Get
-from control.ev import ChargeTemplate, Ev
+from control.ev.ev import Ev
+from control.ev.charge_template import ChargeTemplate
 from control.general import General
 from control.chargepoint.chargepoint_state import ChargepointState
 from modules.common.fault_state import FaultStateLevel

packages/control/data.py

@@ -20,7 +20,9 @@
 from helpermodules.subdata import SubData
 from control.counter import Counter
 from control.counter_all import CounterAll
-from control.ev import ChargeTemplate, Ev, EvTemplate
+from control.ev.charge_template import ChargeTemplate
+from control.ev.ev import Ev
+from control.ev.ev_template import EvTemplate
 from control.general import General
 from control.optional import Optional
 from modules.common.abstract_device import AbstractDevice