now using directory directly rather than rewrite rule
tidy