Moved many neighbourhood definitions to the neighbours class