Streamlined module names.
Updated documentation to PSR-0