Moved HERE lib to separate folder.
Bug fix.