Refactor filesystem structure