Refactor for Request Handler
Merge remote-tracking branch 'origin/master'
Added test to check if file exist