Config cleanup

Preparation for move to Primary folder