Remove x-directory/normal, close github bug #6 and #17.