cleaning up file naming and getting some placeholders setup for unit testing
renamed files
more name changes
more unit tests and modified a few methods as well as refactored others