Created common section and moved some rules into it