Various Changes

Rearchitecting the files and adding DropShell