FileStorage splitted into StorageService and *Storage