Merge "Citadel: move rules to common directory"