Combined all the code I wrote into the repo, and reorganized some stuff into packages for reorginzation.

I actually created a new gradle project (actually copied my existing one).For whatever reason the new one wasn't using Java 8, and that was messing up the code I wrote and I think this will be better.

If anyone has any problems email me.