Refactoring paths, text values, and Client Adapter
Removing files with old path