doing some refactoring at the file level, making files match up and have logical names, minor edits inside