Small restructuring of the files