Reorganization
No drone wasp

Signed-off-by: David Silver <dms.silver@gmail.com>