Refactor namespace for havana
Merge pull request #31 from hogepodge/stable/havana

Refactor namespace for havana