Moved the files around a bit and implemented a few class definitions.