Drag events separated from click events.  Also cleaning up working branch
Removing old working directory