Merge pull request #137 from afrjorge/core-refactor

[CDF-205] - CDF core-refactor
Merge pull request #138 from afrjorge/core-refactor

[CDF-205] - CDF core-refactor