refactor of package name and  FileStorage implementation