Rearranged namespace a bit to satisfy lein test