And made the documentation reflect the refactoring