Restucture and add map event
Merge branch 'master' of https://github.com/zaynetro/fishermate