support sub directory
clean up