Redid namespaces to fit linq to jive
renamed directories