Updated organzation of content finder
Updated organization of cf code