Fixed more things + implemented

Did a check for moving to same folder
Did a null value string check
Implemented Renaming