re-organize and ongoing development