Slight reorganization and new readme.