Merge pull request #142 from afrjorge/core-refactor

[CDF-205] - CDF core-refactor