folder rename and some git stuff