Move misplaced files and fix prototypes.
Merge pull request #28 from atgeirr/fix-cartesian

Move misplaced files and fix prototypes.