Renamed projection functions to make more sense
Renamed more projection stuff to make more sense
Added some more tests