refactored filesystem structure