Some file restructuring