Rename and move a lil
Small updates