Add test file
Add ellipse mercator
Reorganize
Reorganize