Changed project structure for easier rule package addition