Gradleized, Refactorized, and Clean Up!

Cleaned up a lot of your code.