code restructuring
Merge branch 'master' of github.com:adform/Academy.InteractiveMap