Improved configuration
Refactored filesystem services