Significant refactoring of module names for clarity and consistency.
Merge pull request #148 from EricWittmann/sramp-project-refactor

Significant refactoring of module names for clarity and consistency.