restructuring some files