Some file ReOrganization