clean up common.conf and diversify configurations into individual files