More plugable fs related refactoring