Misc clean up
Rename
Clean up and generalize zoom related code
Refactor project structure