Split out equipment and organisation rules into new files. Old equipment rules simplified for Modern.