Python import statements were too annoying to deal with. Temporarily, let's keep things in the same files. We can separate the modules into folders later. I also fixed other import statement and naming bugs that arose when we renamed things. I also moved the Atom datatype into the graph module.