Added some minor logging
Added moved all handlers to new file and added error handler