big cleanup, removed unused code
changed namespace to bikini