added zabuza namespace
added package dir
tests now support refactored directory