reorganized framework structure