Refactor org files