[D46][Refactor] (BJ, CP) now really added the files created while refactoring