Changed contentfactory to only need the filename, and to assume the resource directory