Basic HTTP FS, refactoring