REST regorganization