[CDF-238] - Reviewed build process for CFR
Merge pull request #2 from pamval/core-refactor

[CDF-238] - Reviewed build process for CFR