Moved some files around.
Cleaned up notes a bit.