Merge "[CDM][Refactoring 2/N] Move association related files to association folder" into main