Moved handlers to app root