Started to refactoring according to CR
Merge branch 'poi' of https://github.com/Wikia/app into poi