#139 File Storage functional area refactoring