CBLT-273:  stage collator files in different directory, to avoid circular dependency

Change-Id: Id82c970fd0215a39cb36ff9452bcd47c580c9368