diff --git a/pts/__init__.py b/pts/__init__.py
index e69de29..9ec9ed0 100644
--- a/pts/__init__.py
+++ b/pts/__init__.py
@@ -0,0 +1 @@
+from .trainer import Trainer
\ No newline at end of file
diff --git a/pts/dataset/__init__.py b/pts/dataset/__init__.py
index 6bd41a9..3753289 100644
--- a/pts/dataset/__init__.py
+++ b/pts/dataset/__init__.py
@@ -1,5 +1,6 @@
-from .common import DataEntry, FieldName
+from .common import DataEntry, FieldName, Dataset
 from .list_dataset import ListDataset
+from .loader import TrainDataLoader
 from .sampler import (
     InstanceSampler,
     BucketInstanceSampler,
diff --git a/pts/dataset/loader.py b/pts/dataset/loader.py
index 9b8d737..86b96bd 100644
--- a/pts/dataset/loader.py
+++ b/pts/dataset/loader.py
@@ -7,9 +7,8 @@ import numpy as np
 # Third-party imports
 import torch
 
-from pts.feature import Transformation
-
 # First-party imports
+from ..feature import Transformation
 from .common import DataEntry, Dataset
 
 DataBatch = Dict[str, Any]
diff --git a/pts/feature/holiday.py b/pts/feature/holiday.py
new file mode 100644
index 0000000..e69de29
diff --git a/pts/feature/transform.py b/pts/feature/transform.py
index 1f4f4a1..89da3d7 100644
--- a/pts/feature/transform.py
+++ b/pts/feature/transform.py
@@ -6,9 +6,9 @@ from typing import Any, Callable, Dict, Iterator, List, Optional, Tuple
 import numpy as np
 import pandas as pd
 
-from pts.exception import assert_pts
-from pts.dataset import DataEntry, InstanceSampler
-
+from ..exception import assert_pts
+from ..dataset.sampler import InstanceSampler
+from ..dataset import DataEntry
 from .time_feature import TimeFeature
 
 MAX_IDLE_TRANSFORMS = 100
diff --git a/pts/model/deepar/__init__.py b/pts/model/deepar/__init__.py
index 1ee14a5..ab81141 100644
--- a/pts/model/deepar/__init__.py
+++ b/pts/model/deepar/__init__.py
@@ -1,2 +1,2 @@
 from .deepar_estimator import DeepAREstimator
-from .deepar_network import DeepARNetwork
\ No newline at end of file
+from .deepar_network import DeepARNetwork, DeepARTrainingNetwork
\ No newline at end of file
diff --git a/pts/model/estimator.py b/pts/model/estimator.py
index 4328db6..1a1fbde 100644
--- a/pts/model/estimator.py
+++ b/pts/model/estimator.py
@@ -1,13 +1,15 @@
 from abc import ABC, abstractmethod
+from typing import NamedTuple
 
 import numpy as np
 import torch
 import torch.nn as nn
 
-from pts.dataset import Dataset, TrainDataLoader
-from pts.feature import Transformation
+from ..dataset import Dataset, TrainDataLoader
+from ..feature import Transformation
 
 from .predictor import Predictor
+from ..trainer import Trainer
 from .utils import get_module_forward_input_names
 
 
diff --git a/pts/model/forecast.py b/pts/model/forecast.py
index 62778ef..87a3b72 100644
--- a/pts/model/forecast.py
+++ b/pts/model/forecast.py
@@ -1,10 +1,11 @@
 from abc import ABC, abstractmethod
-from typing import Dict, Enum, List, Optional, Set
+from enum import Enum
+from typing import Dict, List, Optional, Set, Union
 
 import numpy as np
 import pandas as pd
 import torch
-from torch.distributions.distribution import Distributions
+from torch.distributions import Distribution
 
 from .quantile import Quantile
 
@@ -103,7 +104,6 @@ class SampleForecast(Forecast):
         parameters, number of iterations ran etc.
     """
 
-    @validated()
     def __init__(
         self,
         samples: Union[torch.Tensor, np.ndarray],
diff --git a/pts/model/predictor.py b/pts/model/predictor.py
index cc364a2..b9db217 100644
--- a/pts/model/predictor.py
+++ b/pts/model/predictor.py
@@ -4,7 +4,6 @@ from typing import Iterator
 from pts.dataset import Dataset
 
 from .forecast import Forecast
-from .predictor import Predictor
 
 
 class Predictor(ABC):