Added reference cms folder, clean-up references