REFAC: re-organize directories