restructuring some of the files