Moved to mbapi, updated versioning scheme, cleaned code