More Lenses!

We had to rename and suffle some things to keep everyone happy.