Cleaned Code

I had moved my files from an old project into a new one, for a few
reasons, none of which seem very good right now. Doing that had broken
the code in several places, but between me fixing things and using the
Gradle Clean option, all errors appear to have gone.

I still have not yet tried to see if the code runs, I can do that later.