UserModels: refactor, add bases and wrappers for all model types.

Author: PMeira

dss/UserModels/GenUserModel.py

@@ -1,10 +1,9 @@
 from __future__ import absolute_import
 from ..enums import SolveModes
-from . import GenUserModelBase #, CapUserControlBase, PVSystemUserModelBase, StoreDynaModelBase, StoreUserModelBase
-# from .CapUserControl import CapUserControl
-from .GenUserModel import GenUserModel
-# from .PVSystemUserModel import PVSystemUserModel
-# from .StoreDynaModel import StoreDynaModel
-# from .StoreUserModel import StoreUserModel
-
-
+from .wrappers import (
+    CapUserControl, 
+    GenUserModel, 
+    PVSystemUserModel, 
+    StoreDynaModel, 
+    StoreUserModel
+)