[ronald, radu] split properties back to per-module