Renaming the helper files
Deleted files cleanup