Update to API 30.0

I updated classes to API 30.0, with all the required movement of code. Also changed some capitalization and cleaned it up a bit.
Enjoy!