fix before big refactoring
template classes redesigned
refactor step1 [methods like nextNeighbour() return iterator instead of template* now]