More Rule Restructure