Added DraggableService, replaced attributes with scope variables, clean up