Added 2 tags to get url filename with and without extension
Fixed some path issues and relocated some files
Fixed some naming issues
Fixed some naming issues
Fixed some naming issues
Fixed some naming issues