1. move handler functions to folder handler