More plugable fs refactoring