Moved creation of filesystem to one wrapper.