various renaming and refactoring; first step in moving things around to begin simplifying some core issues