Added !drop, changed structure around

!drop now works correctly, changed the file structure around a little,
added some other code