Improved documentation and structure of amalgamation module