added filesystem slave; refactoring