renaming handlers file
cleaning up