Moved handler funcs to handlers.go