Move ContentFactory into the directory where it belongs