More refactoring and added files for different types of drops

Signed-off-by: Chris Conley <chrisc93@vt.edu>