re-organize directory hierarchy