Further refactoring and reverted drools version back to beta4 to be aligned with swyd 1.0.Final