HCOLL-121 fixed some compilation issues regarding moving files around prior to the release