FileSystemAccessWrapper refactoring. This commit closes #3