Integration of Drools Rule editors. Some tidy-up. Work in progress