refactoring: moved classes into packages, implemented sorted neighbourhood strategy