Comment factories include URL
Change factory file naming

I'm used to searching for a 'foo factory' file, not 'factories foo'.