Refactor members into directories