Refactor filesystem layout