D3, Shruthi | #1131 | Organizing/renaming modules in preparation to add the new openelis feed client module.