Updated wrapping and namespacing for new split files