fileStorageService moved to appropriate package