re-organize views folders