Added toplevel dropper module
Fixed class structures