Fixing namespace bugs and adding shippable file