Merged listeners into their appropiate classes
Added graphics classes