Improved namespace and directory structure.