reorganize rules
add jbehave test