Minor reorganization and documentation cleanup