[CDF-238] - Still tweaking builds
Merge pull request #130 from pamval/core-refactor

[CDF-238] - Still tweaking builds