Reorganizing for documentation