fix(Minor):- Rename files and movement improved