Correct urls, and file hierarchie