rename 'cms' to 'block'
simplify table structure