Revert "Refactored geometry and camera APIs"

This reverts commit 4de4af90c24746ba64f7de486de424eef6726dc1.
Some fixes