Refactored module namespace
Updated documentation