Moved things around and started working on documentation.