Namespace corrections.
Start of BitBucket class.