Moved defuns to own file