modifications to structure and documentation