Rename and untrack some folders