Refactored file subsystem