Adding some changes required for the restructuring of some of the files