Reorganized & renamed
Added mock scatter data