Add usr files
Fix paths