Rearranged a few things
Changed package names
Added more tests