Moved handlers into new directory