Some file reorganizations