introduce module separation and a content policy