LocalSearch Refactoring - PART I - lets find a new way