add drop for pictures
module reorganization