Merged class Drop into DropController

closes #112.

* Moved functions from Drop.java into DropController.java
* Deleted Drop.java
* Renamed DropTest.java to DropControllerTest.java
I mean that the fields of a class definition should be together in the first lines of that class definition -- not some field definitions in line 114 of that class definition, after a bunch of methods have already been written.