better query string handling and subdirectories support
file cleaning